# Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
#
# This file is part of Koha.
#
my $patron = $input->Vars;
foreach (keys %$patron){
- delete $$patron{$_} unless($$patron{$_});
+ delete $$patron{$_} unless($$patron{$_});
}
-
my @categories=C4::Category->all;
-my $branches=(defined $$patron{branchcode}?GetBranchesLoop($$patron{branchcode}):GetBranchesLoop());
+
+my $branches = GetBranches;
+my @branchloop;
+
+foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
+ my $selected;
+ $selected = 1 if $branches->{$_}->{branchcode} eq $$patron{branchcode};
+ my %row = ( value => $_,
+ selected => $selected,
+ branchname => $branches->{$_}->{branchname},
+ );
+ push @branchloop, \%row;
+}
my %categories_dislay;
};
$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;
}
@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 $searchtype = $input->param('searchtype');
+my %searchtype_ok = ( 'contain' => 1 );
+if ( !defined($searchtype_ok{$searchtype}) ) {
+ undef $searchtype;
+}
+
+my $from = ( $startfrom - 1 ) * $resultsperpage;
+my $to = $from + $resultsperpage;
+
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 = $searchtype || ( $quicksearch ? "field_start_with" : "start_with" );
+ ($results) = Search( $member || $patron, \@orderby, undef, undef, \@searchfields, $search_scope );
+}
+
+if ($results) {
+ for my $field ('categorycode','branchcode'){
+ next unless ($patron->{$field});
+ @$results = grep { $_->{$field} eq $patron->{$field} } @$results;
+ }
+ $count = scalar(@$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);
+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;
my %row = (
count => $index++,
- %$borrower,
- %{$categories_dislay{$$borrower{categorycode}}},
+ %$borrower,
+ (defined $categories_dislay{ $borrower->{categorycode} }? %{ $categories_dislay{ $borrower->{categorycode} } }:()),
overdues => $od,
issues => $issue,
odissue => "$od/$issue",
fines => sprintf("%.2f",$fines),
+ branchname => $branches->{$borrower->{branchcode}}->{branchname},
);
push(@resultsdata, \%row);
}
-if ($$patron{branchcode}){
- foreach my $branch (grep{$_->{value} eq $$patron{branchcode}}@$branches){
- $$branch{selected}=1;
- }
-}
if ($$patron{categorycode}){
foreach my $category (grep{$_->{categorycode} eq $$patron{categorycode}}@categories){
$$category{selected}=1;
);
my @letters = map { {letter => $_} } ( 'A' .. 'Z');
-$template->param( letters => \@letters );
$template->param(
+ letters => \@letters,
paginationbar => pagination_bar(
$base_url,
int( $count / $resultsperpage ) + ($count % $resultsperpage ? 1 : 0),
startfrom => $startfrom,
from => ($startfrom-1)*$resultsperpage+1,
to => $to,
- multipage => ($count != $to+1 || $startfrom!=1),
-);
-$template->param(
- branchloop=>$branches,
+ multipage => ($count != $to || $startfrom!=1),
+ advsearch => ($$patron{categorycode} || $$patron{branchcode}),
+ branchloop=>\@branchloop,
categories=>\@categories,
-);
-
-
-$template->param(
- searching => "1",
+ searching => "1",
actionname =>basename($0),
%$patron,
numresults => $count,