X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=patroncards%2Fmembers-search.pl;h=6c27095377d59ffb2536503cd7be6e10d9e02bb0;hb=0d4acbba5c5db238eb42ed37dc9ba3dc2f36974b;hp=c2abe0775326366082875df7e9f01b6ac715a946;hpb=700249eb3cbf765a5a731effd21ba543b74eb334;p=koha.git

diff --git a/patroncards/members-search.pl b/patroncards/members-search.pl
index c2abe07753..6c27095377 100755
--- a/patroncards/members-search.pl
+++ b/patroncards/members-search.pl
@@ -33,9 +33,20 @@ my $batch_id = $cgi->param('batch_id') || 0;
 my $startfrom = $cgi->param('startfrom')||1;
 my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
 my $category = $cgi->param('category') || undef;
-my $member = $cgi->param('member') || undef;
+my $member = $cgi->param('member') || '';
 my $orderby = $cgi->param('orderby') || undef;
 
+my @categories=C4::Category->all;
+my %categories_display;
+
+foreach my $category (@categories) {
+    my $hash={
+        category_description=>$$category{description},
+        category_type=>$$category{category_type}
+    };
+    $categories_display{$$category{categorycode}} = $hash;
+}
+
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
                 template_name => "patroncards/members-search.tmpl",
                 query => $cgi,
@@ -49,17 +60,9 @@ $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
 
 if ($member || $category) {
-    my ($count,$results) = 0,0;
-
-    if(length($member) == 1)
-    {
-        ($count,$results) = SearchMember($member,$orderby,"simple");
-    }
-    else
-    {
-        ($count,$results) = SearchMember($member,$orderby,"advanced",$category);
-    }
-
+    my $results = $category ? Search({''=>$member, categorycode=>$category}, $orderby)
+                            : Search($member, $orderby);
+    my $count = $results ? @$results : 0;
 
     my @resultsdata = ();
     my $to = ($count>($startfrom * $resultsperpage)?$startfrom * $resultsperpage:$count);
@@ -68,13 +71,12 @@ if ($member || $category) {
         my ($od,$issue,$fines) = GetMemberIssuesAndFines($results->[$i]{'borrowernumber'});
         my %row = (
             count               => $i + 1,
+                %{$categories_display{$results->[$i]{categorycode}}},
             borrowernumber      => $results->[$i]{'borrowernumber'},
             cardnumber          => $results->[$i]{'cardnumber'},
             surname             => $results->[$i]{'surname'},
             firstname           => $results->[$i]{'firstname'},
             categorycode        => $results->[$i]{'categorycode'},
-            category_type       => $results->[$i]{'category_type'},
-            category_description        => $results->[$i]{'description'},
             address             => $results->[$i]{'address'},
             address2            => $results->[$i]{'address2'},
             city                => $results->[$i]{'city'},