[Koha-cvs] CVS: koha/C4 Output.pm,1.6.2.24,1.6.2.25 Reserves2.pm,1.5.2.12,1.5.2.13

[Finlay Thompson]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv17300

Modified Files:
      Tag: rel-1-2
	Output.pm Reserves2.pm 
Log Message:

Some small changes to enable the new hlt opac


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.6.2.24
retrieving revision 1.6.2.25
diff -C2 -r1.6.2.24 -r1.6.2.25
*** Output.pm	14 Nov 2002 22:17:22 -0000	1.6.2.24
--- Output.pm	26 Nov 2002 04:45:03 -0000	1.6.2.25
***************
*** 31,35 ****
  use C4::Database;
  use C4::Koha;
! use C4::Auth;         # checkauth, getborrowernumber.
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 31,35 ----
  use C4::Database;
  use C4::Koha;
! 
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 120,127 ****
      my ($theme, $lang) = themelanguage($htdocs, $tmplbase);
  
!     my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase", 
! 				   die_on_bad_params => 0,
! 				   global_vars       => 1,
! 				   path              => ["$htdocs/$theme/$lang/includes"]);
  
      $template->param(themelang => "/$theme/$lang");
--- 120,128 ----
      my ($theme, $lang) = themelanguage($htdocs, $tmplbase);
  
!     my $template = HTML::Template->new(filename          => "$htdocs/$theme/$lang/$tmplbase", 
! 				       die_on_bad_params => 0,
! 				       global_vars       => 1,
! 				       debug             => 0,
! 				       path              => ["$htdocs/$theme/$lang/includes"]);
  
      $template->param(themelang => "/$theme/$lang");

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -C2 -r1.5.2.12 -r1.5.2.13
*** Reserves2.pm	5 Nov 2002 23:26:25 -0000	1.5.2.12
--- Reserves2.pm	26 Nov 2002 04:45:03 -0000	1.5.2.13
***************
*** 39,44 ****
    my ($bib,$bor)=@_;
    my $dbh=C4Connect;
!   my $query="SELECT *,reserves.branchcode,biblio.title AS btitle
!                       FROM reserves,borrowers,biblio ";
    if ($bib){
        $bib = $dbh->quote($bib);
--- 39,44 ----
    my ($bib,$bor)=@_;
    my $dbh=C4Connect;
!   my $query="SELECT *,reserves.branchcode AS branchcode, biblio.title AS btitle
!                       FROM borrowers,reserves,biblio ";
    if ($bib){
        $bib = $dbh->quote($bib);
***************
*** 462,472 ****
      my $dbh=C4Connect;
      my $query = "SELECT biblioitems.volumeddesc AS volumeddesc,
!                         biblioitems.itemtype AS itemtype 
!                    FROM reserveconstraints,biblioitems 
                    WHERE reserveconstraints.biblioitemnumber = biblioitems.biblioitemnumber
                      AND reserveconstraints.biblionumber     = $biblio 
                      AND reserveconstraints.borrowernumber   = $bor 
!                     AND reserveconstraints.reservedate      = '$date' 
!                     AND reserveconstraints.timestamp        = $timestamp";
      my $sth=$dbh->prepare($query);
      $sth->execute;
--- 462,473 ----
      my $dbh=C4Connect;
      my $query = "SELECT biblioitems.volumeddesc AS volumeddesc,
!                         itemtypes.description    AS itemtype,
!                         itemtypes.publictype    AS publictype
!                    FROM reserveconstraints,biblioitems,itemtypes 
                    WHERE reserveconstraints.biblioitemnumber = biblioitems.biblioitemnumber
+                     AND biblioitems.itemtype                = itemtypes.itemtype
                      AND reserveconstraints.biblionumber     = $biblio 
                      AND reserveconstraints.borrowernumber   = $bor 
!                     AND reserveconstraints.reservedate      = '$date'";
      my $sth=$dbh->prepare($query);
      $sth->execute;