[Koha-cvs] CVS: koha detail.pl,1.16,1.17 MARCdetail.pl,1.6,1.7 request.pl,1.17,1.18 search.pl,1.22,1.23

[Paul POULAIN]

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

Modified Files:
	detail.pl MARCdetail.pl request.pl search.pl 
Log Message:
road to 1.3.2
various bugfixes, improvments, and migration from acquisition.pm to biblio.pm

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** detail.pl	16 Oct 2002 12:37:12 -0000	1.16
--- detail.pl	19 Nov 2002 12:31:34 -0000	1.17
***************
*** 29,38 ****
  my $query=new CGI;
  my $type=$query->param('type');
! (-e "opac") && ($type='opac');
  ($type) || ($type='intra');
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
  
  my $biblionumber=$query->param('bib');
! my $type='intra';	# FIXME - There's already a $type in this scope
  
  
--- 29,38 ----
  my $query=new CGI;
  my $type=$query->param('type');
! #(-e "opac") && ($type='opac');
  ($type) || ($type='intra');
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
  
  my $biblionumber=$query->param('bib');
! #my $type='intra';	# FIXME - There's already a $type in this scope
  
  

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MARCdetail.pl	12 Nov 2002 15:58:43 -0000	1.6
--- MARCdetail.pl	19 Nov 2002 12:31:34 -0000	1.7
***************
*** 60,64 ****
  
  my $record =MARCgetbiblio($dbh,$bibid);
! warn $record->as_formatted();
  # open template
  my $template = gettemplate("catalogue/MARCdetail.tmpl",0);
--- 60,64 ----
  
  my $record =MARCgetbiblio($dbh,$bibid);
! #warn $record->as_formatted();
  # open template
  my $template = gettemplate("catalogue/MARCdetail.tmpl",0);

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** request.pl	30 Oct 2002 14:01:26 -0000	1.17
--- request.pl	19 Nov 2002 12:31:34 -0000	1.18
***************
*** 29,33 ****
  use C4::Output;
  use C4::Reserves2;
! use C4::Acquisitions;
  use C4::Koha;
  use C4::Circulation::Circ2;
--- 29,33 ----
  use C4::Output;
  use C4::Reserves2;
! use C4::Biblio;
  use C4::Koha;
  use C4::Circulation::Circ2;
***************
*** 155,159 ****
  <td>$notes</td>
  <TD>$date</td>
! <TD>$pickup</td>
  <TD>$type</td>
  </tr>
--- 155,159 ----
  <td>$notes</td>
  <TD>$date</td>
! <TD>OO $pickup</td>
  <TD>$type</td>
  </tr>

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** search.pl	16 Oct 2002 12:42:29 -0000	1.22
--- search.pl	19 Nov 2002 12:31:35 -0000	1.23
***************
*** 29,38 ****
  my $query=new CGI;
  my $type=$query->param('type');
- warn $type;		# FIXME - What's this for?
  
  #(-e "opac") && ($type='opac');
  
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
- warn $type;		# FIXME - What's this for?
  
  my $startfrom=$query->param('startfrom');
--- 29,36 ----