allow card-only searches

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11879 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
index d7b6891..4aa8539 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
@@ -559,10 +559,10 @@ sub patron_search {
                }
        } elsif ($addr_where) {
                $select = "$a_select";
-       } else {
-               return undef;
        }
 
+       return undef if (!$select && !$card);
+
        my $order_by = join ', ', map { 'LOWER(users.'. (split / /,$_)[0] . ') ' . (split / /,$_)[1] } @$sort;
        my $distinct_list = join ', ', map { 'LOWER(users.'. (split / /,$_)[0] . ')' } @$sort;
 
@@ -585,11 +585,12 @@ sub patron_search {
 
        my $descendants = "actor.org_unit_descendants($ws_ou, $ws_ou_depth)";
 
+       $select = "JOIN ($select) AS search ON (search.id = users.id)" if ($select);
        $select = <<"   SQL";
                SELECT  DISTINCT $distinct_list
                  FROM  $u_table AS users $card
-                       JOIN ($select) AS search ON (search.id = users.id)
                        JOIN $descendants d ON (d.id = users.home_ou)
+                       $select
                        $opt_in_join
                        $clone_select
                  WHERE users.deleted = FALSE