Bug 6521 - allow blank cardnumbers to not trigger "already in use"

[srvgit] / members / member.pl

diff --git a/members/member.pl b/members/member.pl
index df688d1..2be45bc 100755 (executable)
--- a/members/member.pl
+++ b/members/member.pl
@@ -6,6 +6,7 @@
 
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -99,14 +100,20 @@ 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":"contain");
- ($results)=Search(\@searchpatron,\@orderby,undef,undef,["firstname","surname","email","othernames","cardnumber","userid"],$search_scope  ) if (@searchpatron);
-if ($results){
-       $count =scalar(@$results);
+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);
+
+if ($results) {
+       for my $field ('categorycode','branchcode'){
+               next unless ($patron->{$field});
+               @$results = grep { $_->{$field} eq $patron->{$field} } @$results; 
+       }
+    $count = scalar(@$results);
 }
 my @resultsdata;
 $to=($count>$to?$to:$count);
@@ -158,7 +165,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,