[Koha-cvs] CVS: koha moredetail.pl,1.14,1.15 search.pl,1.20,1.21

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv25632

Modified Files:
        moredetail.pl search.pl 
Log Message:
merging arens + my modifs/bugfixes

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** moredetail.pl       14 Oct 2002 01:10:01 -0000      1.14
--- moredetail.pl       14 Oct 2002 07:40:04 -0000      1.15
***************
*** 27,32 ****
--- 27,37 ----
  use C4::Search;
  use C4::Acquisitions;
+ <<<<<<< moredetail.pl
+ use C4::Output;
+ 
+ =======
  use C4::Output; # contains gettemplate
  
+ >>>>>>> 1.14
  my $query=new CGI;
  
***************
*** 35,42 ****
  my $startfrom=$query->param('startfrom') || 0;
  
! 
! my $template = gettemplate("catalogue/moredetail.tmpl");
! 
! # get variables
  
  my $biblionumber=$query->param('bib');
--- 40,51 ----
  my $startfrom=$query->param('startfrom') || 0;
  
! my $subject=$query->param('subject');
! # if its a subject we need to use the subject.tmpl
! my $template;
! if ($subject){
!       $template = gettemplate("catalogue/subject.tmpl");
! } else {
!       $template = gettemplate("catalogue/moredetail.tmpl");
! }
  
  my $biblionumber=$query->param('bib');

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** search.pl   14 Oct 2002 01:13:18 -0000      1.20
--- search.pl   14 Oct 2002 07:40:04 -0000      1.21
***************
*** 29,36 ****
  my $query=new CGI;
  my $type=$query->param('type');
! (-e "opac") && ($type='opac');
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') 
? (1) : (0));
  
  
  my $startfrom=$query->param('startfrom');
--- 29,38 ----
  my $query=new CGI;
  my $type=$query->param('type');
! warn $type;
  
! #(-e "opac") && ($type='opac');
  
+ my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') 
? (1) : (0));
+ warn $type;
  
  my $startfrom=$query->param('startfrom');
***************
*** 178,181 ****
--- 180,188 ----
  
  $template->param(numbers => address@hidden);
+ if (C4::Context->preference('acquisitions') eq 'simple') {
+       $template->param(script => "MARCdetail.pl");
+ } else {
+       $template->param(script => "detail.pl");
+ }
  
  # Print the page