[open-ils-commits] r7614 - branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher

[svn at svn.open-ils.org]

Author: miker
Date: 2007-08-01 09:26:41 -0400 (Wed, 01 Aug 2007)
New Revision: 7614

Modified:
   branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
Log:
backporting from 1.3: result filtering based on copy circ_lib instead of cn owning_lib

Modified: branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
===================================================================
--- branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2007-08-01 00:15:04 UTC (rev 7613)
+++ branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2007-08-01 13:26:41 UTC (rev 7614)
@@ -1278,7 +1278,7 @@
 					AND cn.record = mrs.source
 					AND cp.status = cs.id
 					AND cp.location = cl.id
-					AND cn.owning_lib = d.id
+					AND cp.circ_lib = d.id
 					AND cp.call_number = cn.id
 					AND cp.opac_visible IS TRUE
 					AND cs.holdable IS TRUE
@@ -1304,6 +1304,7 @@
 			  WHERE	EXISTS (
 			  	SELECT	1
 				  FROM	$asset_call_number_table cn,
+					$asset_copy_table cp,
 					$metabib_metarecord_source_map_table mrs,
 					$br_table br,
 					$descendants d,
@@ -1312,9 +1313,15 @@
 				  WHERE	mrs.metarecord = s.metarecord
 					AND br.id = mrs.source
 					AND cn.record = mrs.source
-					AND cn.owning_lib = d.id
+					AND cn.id = cp.call_number
 					AND br.deleted IS FALSE
+					AND cn.deleted IS FALSE
 					AND ord.record = mrs.source
+					AND (	cn.owning_lib = d.id
+						OR (	cp.circ_lib = d.id
+							AND cp.deleted IS FALSE
+						)
+					)
 					$ot_filter
 					$of_filter
 					$oa_filter
@@ -1727,7 +1734,7 @@
 					AND cn.record = mrs.source
 					AND cp.status = cs.id
 					AND cp.location = cl.id
-					AND cn.owning_lib = d.id
+					AND cp.circ_lib = d.id
 					AND cp.call_number = cn.id
 					AND cp.opac_visible IS TRUE
 					AND cs.holdable IS TRUE
@@ -1784,10 +1791,14 @@
 							$br_table br
 						  WHERE	br.id = omrs.source
 							AND cn.record = omrs.source
-							AND cn.owning_lib = d.id
 							AND br.deleted IS FALSE
 							AND cn.deleted IS FALSE
 							AND cp.call_number = cn.id
+							AND (	cn.owning_lib = d.id
+								OR (	cp.circ_lib = d.id
+									AND cp.deleted IS FALSE
+								)
+							)
 							$avail_filter
 						  LIMIT 1
 					)
@@ -2203,7 +2214,6 @@
 				  WHERE	cn.record = s.id
 					AND cp.status = cs.id
 					AND cp.location = cl.id
-					AND cn.owning_lib = d.id
 					AND cp.call_number = cn.id
 					AND cp.opac_visible IS TRUE
 					AND cs.holdable IS TRUE
@@ -2211,6 +2221,7 @@
 					AND d.opac_visible IS TRUE
 					AND cp.deleted IS FALSE
 					AND cn.deleted IS FALSE
+					AND cp.circ_lib = d.id
 					$avail_filter
 				  LIMIT 1
 			  	)
@@ -2229,9 +2240,13 @@
 					$asset_copy_table cp,
 					$descendants d
 				  WHERE	cn.record = s.id
-					AND cn.owning_lib = d.id
 					AND cp.call_number = cn.id
 					AND cn.deleted IS FALSE
+					AND (	cn.owning_lib = d.id
+						OR (	cp.circ_lib = d.id
+							AND cp.deleted IS FALSE
+						)
+					)
 					$avail_filter
 				  LIMIT 1
 				)
@@ -2256,17 +2271,10 @@
 	
 	$log->debug("Search yielded ".scalar(@$recs)." results.",DEBUG);
 
-#	my $max = 0;
-#	$max = 1 if (!@$recs);
-#	for (@$recs) {
-#		$max = $$_[1] if ($$_[1] > $max);
-#	}
-
 	my $count = scalar(@$recs);
 	for my $rec (@$recs[$offset .. $offset + $limit - 1]) {
 		next unless ($$rec[0]);
 		my ($mrid,$rank) = @$rec;
-#		$client->respond( [$mrid, sprintf('%0.3f',$rank/$max), $count] );
 		$client->respond( [$mrid, sprintf('%0.3f',$rank), $count] );
 	}
 	return undef;