X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fguarantor_search.pl;h=e71374eeb5218f9c03655af090028280b06cea70;hb=de03c263f0579d28a735e3b1261121e439263a82;hp=cbd958d1dc6de217152885cecd01527480312b56;hpb=a8222aeeb1169d7b1939d1e64c319a16e3846e8c;p=koha_fer

diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index cbd958d1dc..e71374eeb5 100755
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # script to find a guarantor
 
 # Copyright 2006 OUEST PROVENCE
@@ -20,94 +19,82 @@
 # 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 Modern::Perl;
+
+use CGI;
+
 use C4::Auth;
 use C4::Output;
-use CGI;
 use C4::Dates qw/format_date/;
 use C4::Members;
 
 my $input = new CGI;
-my ($template, $loggedinuser, $cookie);
-
-	($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/guarantor_search.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-# }
-my $theme = $input->param('theme') || "default";
-			# only used if allowthemeoverride is set
-
-
-my $member=$input->param('member');
-my $orderby=$input->param('orderby');
-my $category_type=$input->param('category_type');
+my ( $template, $loggedinuser, $cookie );
+
+( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "members/guarantor_search.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1 },
+        debug           => 1,
+    }
+);
+
+my $member        = $input->param('member') // '';
+my $orderby       = $input->param('orderby');
+my $category_type = $input->param('category_type');
+
 $orderby = "surname,firstname" unless $orderby;
-$member =~ s/,//g;   #remove any commas from search string
+$member =~ s/,//g;     #remove any commas from search string
 $member =~ s/\*/%/g;
-if ($member eq ''){
-		$template->param(results=>0);
-}else{
-		$template->param(results=>1);
-}	
+
+$template->param( results => $member );
 
 my $search_category = 'A';
-if ($category_type eq 'P'){
-	$search_category = 'I';
+if ( $category_type eq 'P' ) {
+    $search_category = 'I';
 }
 
-my ($count,$results);
+my ( $count, $results );
 my @resultsdata;
-my $background = 0;
-
-if ($member ne ''){
-	if(length($member) == 1)
-	{
-		($count,$results)=SearchMember($member,$orderby,"simple",$search_category);
-	}
-	else
-	{
-		($count,$results)=SearchMember($member,$orderby,"advanced",$search_category);
-	}
-	for (my $i=0; $i < $count; $i++){
-	#find out stats
-	my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowerid'});
-	my $guarantorinfo=uc($results->[$i]{'surname'})." , ".ucfirst($results->[$i]{'firstname'});
-	my %row = (
-		background => $background,
-		count => $i+1,
-		borrowernumber => $results->[$i]{'borrowernumber'},
-		cardnumber => $results->[$i]{'cardnumber'},
-		surname => $results->[$i]{'surname'},
-		firstname => $results->[$i]{'firstname'},
-		categorycode => $results->[$i]{'categorycode'},
-		streetnumber => $results->[$i]{'streetnumber'},
-		address => $results->[$i]{'address'},
-		city => $results->[$i]{'city'},
-		zipcode => $results->[$i]{'zipcode'},
-		country => $results->[$i]{'country'},
-		branchcode => $results->[$i]{'branchcode'},
-		guarantorinfo =>$guarantorinfo,
-		#op
-		dateofbirth =>format_date($results->[$i]{'dateofbirth'}),
-		#fi op	
-		
-		odissue => "$od/$issue",
-		fines => $fines,
-		borrowernotes => $results->[$i]{'borrowernotes'});
-	if ( $background ) { $background = 0; } else {$background = 1; }
-	push(@resultsdata, \%row);
-		}
+
+if ( $member ne '' ) {
+    $results =
+      Search( { '' => $member, category_type => $search_category }, $orderby );
+
+    $count = $results ? @$results : 0;
+
+    for ( my $i = 0 ; $i < $count ; $i++ ) {
+        my %row = (
+            count          => $i + 1,
+            borrowernumber => $results->[$i]{'borrowernumber'},
+            cardnumber     => $results->[$i]{'cardnumber'},
+            surname        => $results->[$i]{'surname'},
+            firstname      => $results->[$i]{'firstname'},
+            categorycode   => $results->[$i]{'categorycode'},
+            streetnumber   => $results->[$i]{'streetnumber'},
+            address        => $results->[$i]{'address'},
+            address2       => $results->[$i]{'address2'},
+            city           => $results->[$i]{'city'},
+            state          => $results->[$i]{'state'},
+            zipcode        => $results->[$i]{'zipcode'},
+            country        => $results->[$i]{'country'},
+            branchcode     => $results->[$i]{'branchcode'},
+            dateofbirth    => format_date( $results->[$i]{'dateofbirth'} ),
+            borrowernotes  => $results->[$i]{'borrowernotes'}
+        );
+
+        push( @resultsdata, \%row );
+    }
 }
-$template->param( 
-			member          => $member,
-			numresults		=> $count,
-			category_type   => $category_type,
-			resultsloop     => \@resultsdata );
+
+$template->param(
+    member        => $member,
+    numresults    => $count,
+    category_type => $category_type,
+    resultsloop   => \@resultsdata
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;