[Koha-cvs] CVS: koha/opac opac-reserve.pl,1.21,1.22 opac-search.pl,1.19,1.20

[Paul POULAIN]

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14766/opac

Modified Files:
	opac-reserve.pl opac-search.pl 
Log Message:


Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-reserve.pl	15 Sep 2004 16:42:42 -0000	1.21
--- opac-reserve.pl	8 Nov 2004 19:56:26 -0000	1.22
***************
*** 38,42 ****
  my $bibdata = bibdata($biblionumber);
   $template->param($bibdata);
! #  $template->param(BORROWER_INFO => \@bordat, biblionumber => $biblionumber);
  
  # get the rank number....
--- 38,42 ----
  my $bibdata = bibdata($biblionumber);
   $template->param($bibdata);
!  $template->param(biblionumber => $biblionumber);
  
  # get the rank number....

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac-search.pl	18 Aug 2004 16:44:37 -0000	1.19
--- opac-search.pl	8 Nov 2004 19:56:26 -0000	1.20
***************
*** 32,35 ****
--- 32,36 ----
  my ($template, $loggedinuser, $cookie);
  my $resultsperpage;
+ my $searchdesc;
  
  if ($op eq "do_search") {
***************
*** 40,43 ****
--- 41,51 ----
  	my @value = $query->param('value');
  
+ 	for (my $i=0;$i<=$#marclist;$i++) {
+ 		if ($searchdesc) { # don't put the and_or on the 1st search term
+ 			$searchdesc .= $and_or[$i]." ".$excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
+ 		} else {
+ 			$searchdesc = $excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
+ 		}
+ 	}
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 131,134 ****
--- 139,143 ----
  							to=>$to,
  							numbers=>\@numbers,
+ 							searchdesc=> $searchdesc,
  							);