# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+#use warnings; FIXME - Bug 2505
use C4::Auth;
use C4::Output;
use CGI;
my $startfrom = $input->param('startfrom')||1;
my $resultsperpage = $input->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
-my ($template, $loggedinuser, $cookie);
-if($quicksearch){
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {borrowers => 1},
- });
-} else {
- ($template, $loggedinuser, $cookie)
+my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "members/member.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {borrowers => 1},
});
-}
+
my $theme = $input->param('theme') || "default";
my $patron = $input->Vars;
}
my $member=$input->param('member');
-my $orderby=$input->param('orderby');
-$orderby = "surname,firstname" unless $orderby;
+my $orderbyparams=$input->param('orderby');
+my @orderby;
+if ($orderbyparams){
+ my @orderbyelt=split(/,/,$orderbyparams);
+ push @orderby, {$orderbyelt[0]=>$orderbyelt[1]||0};
+}
+else {
+ @orderby = ({surname=>0},{firstname=>0});
+}
+
$member =~ s/,//g; #remove any commas from search string
$member =~ s/\*/%/g;
my ($count,$results);
-if (C4::Context->preference("IndependantBranches")){
- if (C4::Context->userenv && C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{'branch'}){
- $$patron{branchcode}=C4::Context->userenv->{'branch'} unless (C4::Context->userenv->{'branch'} eq "insecure");
- }
-}
-$$patron{firstname}.="\%" if ($$patron{firstname});
-$$patron{surname}.="\%" if ($$patron{surname});
-
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);
- ($results)=Search(\@searchpatron,{surname=>1,firstname=>1},undef,undef,["firstname","surname","email","othernames","cardnumber"],"start_with" ) 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);
}
my @resultsdata;
-my $to=($count>$to?$to:$count);
+$to=($count>$to?$to:$count);
my $index=$from;
foreach my $borrower(@$results[$from..$to-1]){
#find out stats
}
my %parameters=
( %$patron
- , 'orderby' => $orderby
+ , 'orderby' => $orderbyparams
, 'resultsperpage' => $resultsperpage
, 'type'=> 'intranet');
my $base_url =
map { "$_=$parameters{$_}" } (keys %parameters)
);
+my @letters = map { {letter => $_} } ( 'A' .. 'Z');
+$template->param( letters => \@letters );
+
$template->param(
paginationbar => pagination_bar(
- $base_url, int( $count / $resultsperpage ) + 1,
+ $base_url,
+ int( $count / $resultsperpage ) + ($count % $resultsperpage ? 1 : 0),
$startfrom, 'startfrom'
),
startfrom => $startfrom,
);
$template->param(
branchloop=>$branches,
- categoryloop=>\@categories,
+ categories=>\@categories,
);