smarter search term propagation, should avoid ARRAY(0xdeadbeef) type ...

[evergreen-equinox.git] / Open-ILS / src / perlmods / lib / OpenILS / WWW / EGCatLoader / Search.pm

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
index 84c68a7..7a4d491 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
@@ -77,11 +77,11 @@ sub _prepare_biblio_search {
         }
     }
 
-    my $site = $cgi->param('loc') || $ctx->{aou_tree}->()->id;
-    if (defined($cgi->param('loc')) or not $query =~ /site\(\d+\)/) {
+    my $site = $cgi->param('loc');
+    if (defined($site) and ($site ne $ctx->{aou_tree}->()->id) and not $query =~ /site\(\d+\)/) {
         $query .= " site($site)";
     }
-    if (defined($cgi->param('depth')) or not $query =~ /depth\(\d+\)/) {
+    if (defined($cgi->param('depth')) and not $query =~ /depth\(\d+\)/) {
         my $depth = defined $cgi->param('depth') ?
             $cgi->param('depth') : $ctx->{find_aou}->($site)->ou_type->depth;
         $query .= " depth($depth)";