X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fmember-search.pl;h=4fa88a0c05a53a7c08068e48a3a58e1ceb7b0a3f;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=a2063f8823bfb40f590bb16da7e129491b2d4d7d;hpb=868b8cdbaa079a948a6015f713fa3384a7f404b5;p=koha_fer

diff --git a/serials/member-search.pl b/serials/member-search.pl
index a2063f8823..4fa88a0c05 100755
--- a/serials/member-search.pl
+++ b/serials/member-search.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# Parts copyright Catalyst IT 2010
+#
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -11,9 +13,9 @@
 # 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.
 
 =head1 member-search.pl
 
@@ -27,32 +29,150 @@ use CGI;
 use C4::Auth;       # get_template_and_user
 use C4::Output;
 use C4::Members;    # BornameSearch
+use C4::Branch;
+use C4::Category;
+use File::Basename;
+
+my $cgi          = new CGI;
+my $theme = $cgi->param('theme') || "default";
+my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
+my $startfrom = $cgi->param('startfrom')||1;
+
+my $patron = $cgi->Vars;
+foreach (keys %$patron){
+    delete $$patron{$_} unless($$patron{$_});
+}
 
-my $query          = new CGI;
-my $subscriptionid = $query->param('subscriptionid');
-my $searchstring   = $query->param('member');
+my @categories=C4::Category->all;
+my $branches=(defined $$patron{branchcode}?GetBranchesLoop($$patron{branchcode}):GetBranchesLoop());
+my $subscriptionid = $cgi->param('subscriptionid');
+my $searchstring   = $cgi->param('member');
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+my %categories_dislay;
+my ($template, $loggedinuser, $cookie);
+    ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "serials/member-search.tmpl",
+                 query => $cgi,
+                 type => "intranet",
+                 authnotrequired => 0,
+                 flagsrequired => { serials => 'routing' },
+                 });
+
+foreach my $category (@categories){
+	my $hash={
+			category_description=>$$category{description},
+			category_type=>$$category{category_type}
+			 };
+	$categories_dislay{$$category{categorycode}} = $hash;
+}
+$template->param(
+        "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
+            );
+if (C4::Context->preference("AddPatronLists")=~/code/){
+    $categories[0]->{'first'}=1;
+}
+
+my $member=$cgi->param('member');
+my $orderby=$cgi->param('orderby');
+$orderby = "surname,firstname" unless $orderby;
+if (defined $member) {
+    $member =~ s/,//g;   #remove any commas from search string
+    $member =~ s/\*/%/g;
+}
+
+my ($count,$results);
+
+if ( C4::Context->preference("IndependentBranches") ) {
+    if (   C4::Context->userenv
+        && !C4::Context->IsSuperLibrarian()
+        && C4::Context->userenv->{'branch'} )
     {
-        template_name   => "serials/member-search.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
-        debug           => 1,
+        $$patron{branchcode} = C4::Context->userenv->{'branch'};
     }
-);
-
-if ($searchstring) {
-    my ( $count, $members ) = &SearchMember( $searchstring, "surname" );
+}
+$$patron{firstname}.="\%" if ($$patron{firstname});
+$$patron{surname}.="\%" if ($$patron{surname});
 
-    $template->param(
-        subscriptionid => $subscriptionid,
-        memberloop     => $members,
-        member         => $searchstring,
+my @searchpatron;
+push @searchpatron, $member if ($member);
+push @searchpatron, $patron if ( keys %$patron );
+my $from = ( $startfrom - 1 ) * $resultsperpage;
+my $to   = $from + $resultsperpage;
+if (@searchpatron) {
+    ($results) = Search(
+        \@searchpatron,
+        [ { surname => 0 }, { firstname => 0 } ],
+        undef,
+        undef,
+        [ "firstname", "surname", "email", "othernames", "cardnumber" ],
+        "start_with"
     );
 }
-else {
-    $template->param( subscriptionid => $subscriptionid, );
+if ($results) {
+    $count = scalar(@$results);
+}
+my @resultsdata;
+$to=($count>$to?$to:$count);
+my $index=$from;
+foreach my $borrower(@$results[$from..$to-1]){
+    # find out stats
+    $borrower->{'dateexpiry'}= C4::Dates->new($borrower->{'dateexpiry'},'iso')->output('syspref');
+    if ($categories_dislay{$borrower->{'categorycode'}}){
+        my %row = (
+	    count => $index++,
+	    %$borrower,
+	    %{$categories_dislay{$$borrower{categorycode}}},
+	);
+	push(@resultsdata, \%row);
+    }
+    else {
+	 warn $borrower->{'cardnumber'} ." has a bad category code of " . $borrower->{'categorycode'} ."\n";
+    }
+}
+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;
+	}
 }
-output_html_with_http_headers $query, $cookie, $template->output;
+my %parameters=
+(  %{$patron},
+    'orderby' => $orderby,
+    'resultsperpage' => $resultsperpage,
+    'type'=> 'intranet');
+my $base_url =
+    'member-search.pl?&'
+  . join(
+    '&',
+    map { "$_=$parameters{$_}" } (keys %parameters)
+  );
+
+$template->param(
+    paginationbar => pagination_bar(
+        $base_url,  int( $count / $resultsperpage ) + 1,
+        $startfrom, 'startfrom'
+    ),
+    startfrom => $startfrom,
+    from      => ($startfrom-1)*$resultsperpage+1,
+    to        => $to,
+    multipage => ($count != $to+1 || $startfrom!=1),
+);
+$template->param(
+    branchloop=>$branches,
+	categoryloop=>\@categories,
+);
+
+
+$template->param(
+        searching       => "1",
+		actionname		=> basename($0),
+		%$patron,
+        numresults      => $count,
+        resultsloop     => \@resultsdata,
+            );
+
+output_html_with_http_headers $cgi, $cookie, $template->output;