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

[svn at svn.open-ils.org]

Author: miker
Date: 2008-07-17 21:13:10 -0400 (Thu, 17 Jul 2008)
New Revision: 10063

Modified:
   branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
Log:
add shelving location filter support

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	2008-07-17 21:24:12 UTC (rev 10062)
+++ branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-07-18 01:13:10 UTC (rev 10063)
@@ -2321,7 +2321,7 @@
 		die "No search arguments were passed to ".$self->api_name;
 	}
 
-	my (@statuses, at types, at forms, at lang, at aud, at lit_form, at vformats);
+	my (@statuses, at locations, at types, at forms, at lang, at aud, at lit_form, at vformats);
 
 	if ($args{available}) {
 		@statuses = (0,7);
@@ -2332,6 +2332,11 @@
 		@statuses = @$s;
 	}
 
+    if (my $s = $args{locations}) {
+        $s = [$s] if (!ref($s));
+        @locations = @$s;
+    }
+
 	if (my $a = $args{audience}) {
 		$a = [$a] if (!ref($a));
 		@aud = @$a;
@@ -2414,6 +2419,7 @@
 	my $param_depth = $args{depth}; $param_depth = 'NULL' unless (defined($param_depth) and length($param_depth) > 0 );
 	my $param_searches = OpenSRF::Utils::JSON->perl2JSON( \%stored_proc_search_args ); $param_searches =~ s/\$//go; $param_searches = '$$'.$param_searches.'$$';
 	my $param_statuses = '$${' . join(',', map { s/\$//go; "\"$_\""} @statuses) . '}$$';
+	my $param_locations = '$${' . join(',', map { s/\$//go; "\"$_\""} @locations) . '}$$';
 	my $param_audience = '$${' . join(',', map { s/\$//go; "\"$_\"" } @aud) . '}$$';
 	my $param_language = '$${' . join(',', map { s/\$//go; "\"$_\""} @lang) . '}$$';
 	my $param_lit_form = '$${' . join(',', map { s/\$//go; "\"$_\"" } @lit_form) . '}$$';
@@ -2437,6 +2443,7 @@
                     $param_depth,
                     $param_searches,
                     $param_statuses,
+                    $param_locations,
                     $param_audience,
                     $param_language,
                     $param_lit_form,