Bug 5549 : Calendar needed a change array_ref to hash_ref

[koha.git] / members / member.pl

diff --git a/members/member.pl b/members/member.pl
index f66b851..9b793f4 100755 (executable)
--- a/members/member.pl
+++ b/members/member.pl
@@ -75,10 +75,11 @@ foreach my $category (@categories){
                         };
        $categories_dislay{$$category{categorycode}} = $hash;
 }
+my $AddPatronLists = C4::Context->preference("AddPatronLists") || '';
 $template->param( 
-        "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
+        "AddPatronLists_$AddPatronLists" => "1",
             );
-if (C4::Context->preference("AddPatronLists")=~/code/){
+if ($AddPatronLists=~/code/){
     $categories[0]->{'first'}=1;
 }  
 
@@ -93,20 +94,21 @@ else {
        @orderby = ({surname=>0},{firstname=>0});
 }
 
+my $searchfields = $input->param('searchfields');
+my @searchfields = $searchfields ? split( ',', $searchfields ) : ( "firstname", "surname", "othernames", "cardnumber", "userid", "email" );
+
 $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
 
-my ($count,$results);
-
-my @searchpatron;
-push @searchpatron, $member if ($member);
-push @searchpatron, $patron if ( keys %$patron );
 my $from = ( $startfrom - 1 ) * $resultsperpage;
 my $to   = $from + $resultsperpage;
 
-#($results)=Search(\@searchpatron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"]  ) if (@searchpatron);
-my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" );
-($results) = Search( \@searchpatron, \@orderby, undef, undef, [ "firstname", "surname", "othernames", "cardnumber", "userid" ], $search_scope ) if (@searchpatron);
+my ($count,$results);
+if ($member || keys %$patron) {
+    #($results)=Search($member || $patron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"]  );
+    my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" );
+    ($results) = Search( $member || $patron, \@orderby, undef, undef, \@searchfields, $search_scope );
+}
 
 if ($results) {
        for my $field ('categorycode','branchcode'){
@@ -115,6 +117,12 @@ if ($results) {
        }
     $count = scalar(@$results);
 }
+
+if($count == 1){
+    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=" . @$results[0]->{borrowernumber});
+    exit;
+}
+
 my @resultsdata;
 $to=($count>$to?$to:$count);
 my $index=$from;
@@ -165,7 +173,7 @@ $template->param(
     startfrom => $startfrom,
     from      => ($startfrom-1)*$resultsperpage+1,  
     to        => $to,
-    multipage => ($count != $to+1 || $startfrom!=1),
+    multipage => ($count != $to || $startfrom!=1),
     advsearch => ($$patron{categorycode} || $$patron{branchcode}),
     branchloop=>\@branchloop,
     categories=>\@categories,