From b8963461fd4efbcd3e8066fc94179bdf6d3d750b Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 8 Nov 2004 19:54:53 +0000
Subject: [PATCH] *** empty log message ***

---
 koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl | 2 +-
 opac/opac-reserve.pl                               | 2 +-
 opac/opac-search.pl                                | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
index 0105b02dfb..e457c2eea2 100755
--- a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
-<h1><a href="/cgi-bin/koha/detail.pl?bib="<!-- TMPL_VAR NAME="biblionumber" -->"&amp;type=intra"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a><br>
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a><br>
 Modify Group - <!-- TMPL_VAR NAME="description" --></h1><br>
 
 <form action="updatebibitem.pl" method="post">
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 47c5b9cc03..67a7273674 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -37,7 +37,7 @@ my $biblionumber = $query->param('bib');
 
 my $bibdata = bibdata($biblionumber);
  $template->param($bibdata);
-#  $template->param(BORROWER_INFO => \@bordat, biblionumber => $biblionumber);
+ $template->param(biblionumber => $biblionumber);
 
 # get the rank number....
 my ($rank,$reserves) = FindReserves($biblionumber,'');
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index e95c3d6af6..d86d9814b9 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -31,6 +31,7 @@ my $startfrom=$query->param('startfrom');
 $startfrom=0 if(!defined $startfrom);
 my ($template, $loggedinuser, $cookie);
 my $resultsperpage;
+my $searchdesc;
 
 if ($op eq "do_search") {
 	my @marclist = $query->param('marclist');
@@ -39,6 +40,13 @@ if ($op eq "do_search") {
 	my @operator = $query->param('operator');
 	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);
 	my $orderby = $query->param('orderby');
@@ -130,6 +138,7 @@ if ($op eq "do_search") {
 							from=>$from,
 							to=>$to,
 							numbers=>\@numbers,
+							searchdesc=> $searchdesc,
 							);
 
 } else {
-- 
2.39.5