Bug 7684: QA Followup and bugfixes

[koha.git] / members / guarantor_search.pl

diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index cbd958d..59ea5b1 100755 (executable)
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -66,14 +66,9 @@ my @resultsdata;
 my $background = 0;
 
 if ($member ne ''){
-       if(length($member) == 1)
-       {
-               ($count,$results)=SearchMember($member,$orderby,"simple",$search_category);
-       }
-       else
-       {
-               ($count,$results)=SearchMember($member,$orderby,"advanced",$search_category);
-       }
+    $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'});
@@ -88,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'},