Bug 8435: (follow-up) make SearchSubscriptions handle lack of userenv

[koha.git] / members / guarantor_search.pl

diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index 17af23d..59ea5b1 100755 (executable)
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -21,6 +21,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use C4::Output;
 use CGI;
@@ -45,6 +46,7 @@ my $theme = $input->param('theme') || "default";
 
 my $member=$input->param('member');
 my $orderby=$input->param('orderby');
+my $category_type=$input->param('category_type');
 $orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
@@ -54,19 +56,19 @@ if ($member eq ''){
                $template->param(results=>1);
 }      
 
+my $search_category = 'A';
+if ($category_type eq 'P'){
+       $search_category = 'I';
+}
+
 my ($count,$results);
 my @resultsdata;
 my $background = 0;
 
 if ($member ne ''){
-       if(length($member) == 1)
-       {
-               ($count,$results)=SearchMember($member,$orderby,"simple",'A');
-       }
-       else
-       {
-               ($count,$results)=SearchMember($member,$orderby,"advanced",'A');
-       }
+    $results = Search({''=>$member, category_type=>$search_category},$orderby);
+    $count = $results ? @$results : 0;
+
        for (my $i=0; $i < $count; $i++){
        #find out stats
        my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowerid'});
@@ -81,7 +83,9 @@ if ($member ne ''){
                categorycode => $results->[$i]{'categorycode'},
                streetnumber => $results->[$i]{'streetnumber'},
                address => $results->[$i]{'address'},
+               address2 => $results->[$i]{'address2'},
                city => $results->[$i]{'city'},
+               state => $results->[$i]{'state'},
                zipcode => $results->[$i]{'zipcode'},
                country => $results->[$i]{'country'},
                branchcode => $results->[$i]{'branchcode'},
@@ -100,7 +104,7 @@ if ($member ne ''){
 $template->param( 
                        member          => $member,
                        numresults              => $count,
-                       
+                       category_type   => $category_type,
                        resultsloop     => \@resultsdata );
 
 output_html_with_http_headers $input, $cookie, $template->output;