Adding countlines

[koha-ffzg.git] / members / member.pl

diff --git a/members/member.pl b/members/member.pl
index 726b6b9..9feb25c 100755 (executable)
--- a/members/member.pl
+++ b/members/member.pl
@@ -32,15 +32,19 @@ use C4::Search;
 use HTML::Template;
 
 my $input = new CGI;
-
-my $theme = $input->param('theme') || "default";
-                       # only used if allowthemeoverride is set
-#my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
-       # FIXME - Error-checking
-#my $template = HTML::Template->new( filename => $tmpldata{'path'},
-#                                  die_on_bad_params => 0,
-#                                  loop_context_vars => 1 );
-my ($template, $loggedinuser, $cookie)
+my $quicksearch = $input->param('quicksearch');
+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},
+                            debug => 1,
+                            });
+} else {
+       ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tmpl",
                             query => $input,
                             type => "intranet",
@@ -48,21 +52,32 @@ my ($template, $loggedinuser, $cookie)
                             flagsrequired => {borrowers => 1},
                             debug => 1,
                             });
+}
+my $theme = $input->param('theme') || "default";
+                       # only used if allowthemeoverride is set
+#my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+       # FIXME - Error-checking
+#my $template = HTML::Template->new( filename => $tmpldata{'path'},
+#                                  die_on_bad_params => 0,
+#                                  loop_context_vars => 1 );
+
 
 my $member=$input->param('member');
+my $orderby=$input->param('orderby');
+$orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
-
+$member =~ s/\*/%/g;
 my $env;
 
 my ($count,$results);
 
 if(length($member) == 1)
 {
-       ($count,$results)=BornameSearch($env,$member,"simple");
+       ($count,$results)=BornameSearch($env,$member,$orderby,"simple");
 }
 else
 {
-       ($count,$results)=BornameSearch($env,$member,"advanced");
+       ($count,$results)=BornameSearch($env,$member,$orderby,"advanced");
 }
 
 
@@ -74,6 +89,7 @@ for (my $i=0; $i < $count; $i++){
 
   my %row = (
        background => $background,
+               count => $i + 1,
         borrowernumber => $results->[$i]{'borrowernumber'},
         cardnumber => $results->[$i]{'cardnumber'},
         surname => $results->[$i]{'surname'},
@@ -90,6 +106,7 @@ for (my $i=0; $i < $count; $i++){
 
 $template->param( 
                        member          => $member,
+                       numresults      => $count,
                        resultsloop     => \@resultsdata );
 
 output_html_with_http_headers $input, $cookie, $template->output;