From c977cc6878fa92b8e4df72e3e130b462521c9783 Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Tue, 13 Jun 2006 09:36:51 +0000
Subject: [PATCH] simplifying search results so that when multiple items
 depends on one location and holdingbranch, it is displayed on one line with
 item counts. If item count is one AND item is on loan or notforloan,
 information is displayed.

---
 C4/SearchMarc.pm                              | 48 ++++++++++++-------
 .../default/en/search.marc/result.tmpl        |  3 ++
 .../opac-tmpl/css/en/opac-searchresults.tmpl  |  1 +
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm
index 6ac0ed7b17..7ff732d6ce 100644
--- a/C4/SearchMarc.pm
+++ b/C4/SearchMarc.pm
@@ -407,12 +407,24 @@ if (C4::Context->preference("sortbynonfiling")) {
 	my $oldline;
 	my ($oldbibid, $oldauthor, $oldtitle);
 	my $sth_itemCN;
-	if (C4::Context->preference('hidelostitems')) {
-		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL) order by homebranch");
+	if (C4::Context->preference('hidelostitem')) {
+		$sth_itemCN = $dbh->prepare("
+  SELECT items.holdingbranch, items.location, items.itemcallnumber, count(*) AS cnt 
+  FROM items 
+  WHERE biblionumber=? AND (itemlost = 0 OR itemlost IS NULL) 
+  ORDER BY homebranch");
 	} else {
-		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? order by homebranch");
+		$sth_itemCN = $dbh->prepare("
+  SELECT items.holdingbranch, items.location, items.itemcallnumber, count(*) AS cnt, items.itemnumber, items.notforloan
+  FROM items 
+  WHERE biblionumber=? 
+  GROUP BY items.holdingbranch, items.location, items.itemcallnumber 
+  ORDER BY homebranch");
 	}
-	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
+	my $sth_issue = $dbh->prepare("
+  SELECT date_due,returndate 
+  FROM issues 
+  WHERE itemnumber=?");
 	# parse all biblios between start & end.
 	while (($counter <= $#result) && ($counter <= ($offset + $length))) {
 		# search & parse all items & note itemcallnumber
@@ -440,24 +452,27 @@ if (C4::Context->preference("sortbynonfiling")) {
 			# then all other fields in the main array
 			
 			# search if item is on loan
-			my $date_due;
-			$sth_issue->execute($item->{itemnumber});
-			while (my $loan = $sth_issue->fetchrow_hashref) {
-				if ($loan->{date_due} and !$loan->{returndate}) {
-					$date_due = $loan->{date_due};
-				}
-			}
 			# store this item
 			my %lineCN;
 			$lineCN{holdingbranch} = $item->{holdingbranch};
 			$lineCN{itemcallnumber} = $item->{itemcallnumber};
 			$lineCN{location} = $item->{location};
-			$lineCN{date_due} = format_date($date_due);
-			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
-			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
-			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
+			$lineCN{cnt} = $item->{cnt} unless ($item->{cnt}==1);
+            if ($item->{cnt}==1){
+              my $date_due;
+              $sth_issue->execute($item->{itemnumber});
+              while (my $loan = $sth_issue->fetchrow_hashref) {
+                  if ($loan->{date_due} and !$loan->{returndate}) {
+                      $date_due = $loan->{date_due};
+                  }
+              }
+              $lineCN{date_due} = format_date($date_due) ;
+              $lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
+              $notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
+            }
+			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan} and not $lineCN{notforloan}); # setting not forloan if itemtype is not for loan
 			push @CNresults,\%lineCN;
-			$totalitems++;
+			$totalitems+=$item->{cnt};
 		}
 		# save the biblio in the final array, with item and item issue status
 		my %newline;
@@ -490,6 +505,7 @@ if (C4::Context->preference("sortbynonfiling")) {
 	return (\@finalresult, $nbresults);
 }
 
+
 # Creates the SQL Request
 
 sub create_request {
diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
index 0f85a62f50..bc551a8eac 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
@@ -56,6 +56,9 @@
 							<!-- TMPL_ELSE -->
 								<!-- TMPL_IF NAME="itemcallnumber" -->
 									(<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                <!-- TMPL_IF name="cnt" -->
+                                  x <!-- TMPL_VAR name="cnt" -->
+                                <!--/TMPL_IF-->
 								<!-- /TMPL_IF -->
 							<!-- /TMPL_IF -->
 							<!-- TMPL_IF name="notforloan" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
index 14e43a3951..a6faf6b555 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -93,6 +93,7 @@
 					<!-- TMPL_LOOP name="CN" -->
 						<p>
 							<!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" -->
+                            <!-- TMPL_IF name="cnt" -->(<!-- TMPL_VAR name="cnt" -->)<!--/TMPL_IF-->
 							<!-- TMPL_IF name="date_due" -->
 								<i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i>
 							<!-- TMPL_ELSE -->
-- 
2.39.5