[Koha-cvs] koha C4/Members.pm circ/circulation.pl members/...

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Changes by:     Henri-Damien LAURENT <hdl>      07/04/24 15:41:28

Modified files:
        C4             : Members.pm 
        circ           : circulation.pl 
        members        : boraccount.pl guarantor_search.pl 
                         memberentry.pl member.pl moremember.pl pay.pl 
        misc/notifys   : fines.pl 
        opac           : opac-account.pl opac-user.pl 
        reserve        : request.pl 
        serials        : distributedto.pl member-search.pl 

Log message:
        Still Code Cleaning.
        Abiding by Name Convention.
        Using Members wherever it should be used.
        Borrower is only used for borrower Categories.
        + GetBorrowersWhoHaveNeverBorrowed
        and lists like that.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/koha/members/boraccount.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/members/guarantor_search.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/koha/members/member.pl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/koha/members/pay.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/misc/notifys/fines.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-account.pl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/serials/distributedto.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/serials/member-search.pl?cvsroot=koha&r1=1.5&r2=1.6

Patches:
Index: C4/Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- C4/Members.pm       24 Apr 2007 14:17:24 -0000      1.47
+++ C4/Members.pm       24 Apr 2007 15:41:27 -0000      1.48
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Members.pm,v 1.47 2007/04/24 14:17:24 hdl Exp $
+# $Id: Members.pm,v 1.48 2007/04/24 15:41:27 hdl Exp $
 
 use strict;
 require Exporter;
@@ -31,7 +31,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.47 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.48 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -55,15 +55,13 @@
 
 #Get data
 push @EXPORT, qw(
-  &SearchBorrower 
+  &SearchMember 
   &GetMemberDetails
   &GetMember
   
   &GetGuarantees 
-  &findguarantor 
-  &GuarantornameSearch
   
-  &GetBorrowerIssuesAndFines
+  &GetMemberIssuesAndFines
   &GetPendingIssues
   &GetAllIssues
   
@@ -76,20 +74,20 @@
   &GetRoadTypes 
   &GetRoadTypeDetails 
   
-  &GetBorrowerAcctRecord
+  &GetMemberAccountRecords
   
   &GetborCatFromCatType 
   &GetBorrowercategory
   
   &GetBorNotifyAcctRecord
-  &GetMembeReregistration
+  &ExtendMemberSubscriptionTo 
   &GetSortDetails
   
-  &GetBorrowersTitles  
+  &GetTitles   
   &GetBorrowersWhoHaveNotBorrowedSince
   &GetBorrowersWhoHaveNeverBorrowed
   &GetBorrowersWithIssuesHistoryOlderThan
-  &GetBorrowersFromSurname 
+  &GetMembersFromSurname 
   
   &GetExpiryDate
 );
@@ -118,9 +116,9 @@
   &MoveMemberToDeleted
 );
 
-=item Searchborrower
+=item SearchMember
 
-  ($count, $borrowers) = &SearchBorrower($searchstring, $type,$category_type);
+  ($count, $borrowers) = &SearchMember($searchstring, $type,$category_type);
 
 Looks up patrons (borrowers) by name.
 
@@ -135,7 +133,7 @@
 must match the beginning a borrower's surname, first name, or other
 name.
 
-C<&SearchBorrower> returns a two-element list. C<$borrowers> is a
+C<&SearchMember> returns a two-element list. C<$borrowers> is a
 reference-to-array; each element is a reference-to-hash, whose keys
 are the fields of the C<borrowers> table in the Koha database.
 C<$count> is the number of elements in C<$borrowers>.
@@ -145,7 +143,7 @@
 #'
 #used by member enquiries from the intranet
 #called by member.pl
-sub SearchBorrower {
+sub SearchMember {
     my ($searchstring, $orderby, $type,$category_type ) = @_;
     my $dbh   = C4::Context->dbh;
     my $query = "";
@@ -322,9 +320,9 @@
         return undef;
     }
     my $borrower = $sth->fetchrow_hashref;
-    my ($amount) = GetBorrowerAcctRecord( $borrowernumber);
+    my ($amount) = GetMemberAccountRecords( $borrowernumber);
     $borrower->{'amountoutstanding'} = $amount;
-    my $flags = patronflags( $borrower, $dbh );
+    my $flags = patronflags( $borrower);
     my $accessflagshash;
 
     $sth = $dbh->prepare("select bit,flag from userflags");
@@ -355,7 +353,7 @@
  NOTE!: If you change this function, be sure to update the POD for
  &GetMemberDetails.
 
- $flags = &patronflags($patron, $dbh);
+ $flags = &patronflags($patron);
 
  $flags->{CHARGES}
         {message}    Message showing patron's credit or debt
@@ -386,7 +384,7 @@
     my %flags;
     my ( $patroninformation) = @_;
     my $dbh=C4::Context->dbh;
-    my ($amount) = GetBorrowerAcctRecord( 
$patroninformation->{'borrowernumber'});
+    my ($amount) = GetMemberAccountRecords( 
$patroninformation->{'borrowernumber'});
     if ( $amount > 0 ) {
         my %flaginfo;
         my $noissuescharge = C4::Context->preference("noissuescharge");
@@ -513,14 +511,14 @@
     }
 }
 
-=item GetBorrowerIssuesAndFines
+=item GetMemberIssuesAndFines
 
-  ($borrowed, $due, $fine) = &GetBorrowerIssuesAndFines($borrowernumber);
+  ($borrowed, $due, $fine) = &GetMemberIssuesAndFines($borrowernumber);
 
 Returns aggregate data about items borrowed by the patron with the
 given borrowernumber.
 
-C<&GetBorrowerIssuesAndFines> returns a three-element array. C<$borrowed> is 
the
+C<&GetMemberIssuesAndFines> returns a three-element array. C<$borrowed> is the
 number of books the patron currently has borrowed. C<$due> is the
 number of overdue items the patron currently has borrowed. C<$fine> is
 the total fine currently due by the borrower.
@@ -528,7 +526,7 @@
 =cut
 
 #'
-sub GetBorrowerIssuesAndFines {
+sub GetMemberIssuesAndFines {
     my ( $borrowernumber ) = @_;
     my $dbh   = C4::Context->dbh;
     my $query =
@@ -1088,13 +1086,13 @@
 }
 
 
-=head2 GetBorrowerAcctRecord
+=head2 GetMemberAccountRecords
 
-  ($total, $acctlines, $count) = &GetBorrowerAcctRecord($borrowernumber);
+  ($total, $acctlines, $count) = &GetMemberAccountRecords($borrowernumber);
 
 Looks up accounting data for the patron with the given borrowernumber.
 
-C<&GetBorrowerAcctRecord> returns a three-element array. C<$acctlines> is a
+C<&GetMemberAccountRecords> returns a three-element array. C<$acctlines> is a
 reference-to-array, where each element is a reference-to-hash; the
 keys are the fields of the C<accountlines> table in the Koha database.
 C<$count> is the number of elements in C<$acctlines>. C<$total> is the
@@ -1103,7 +1101,7 @@
 =cut
 
 #'
-sub GetBorrowerAcctRecord {
+sub GetMemberAccountRecords {
     my ($borrowernumber,$date) = @_;
     my $dbh = C4::Context->dbh;
     my @acctlines;
@@ -1486,11 +1484,11 @@
 
 }    # sub add_member_orgs
 
-=head2 GetBorrowersFromSurname
+=head2 GetMembersFromSurname
 
 =over 4
 
address@hidden = GetBorrowersFromSurname($surname)
address@hidden = GetMembersFromSurname($surname)
 this function get the list of borrower names like $surname.
 return :
 the table of results in @results
@@ -1499,7 +1497,7 @@
 
 =cut
 
-sub GetBorrowersFromSurname {
+sub GetMembersFromSurname {
     my ($searchstring) = @_;
     my $dbh = C4::Context->dbh;
     $searchstring =~ s/\'/\\\'/g;
@@ -1716,15 +1714,15 @@
 
 
 
-=head2 GetBorrowersTitles (OUEST-PROVENCE)
+=head2 GetTitles (OUEST-PROVENCE)
 
-  ($borrowertitle)= &GetBorrowersTitles();
+  ($borrowertitle)= &GetTitles();
 
 Looks up the different title . Returns array  with all borrowers title
 
 =cut
 
-sub GetBorrowersTitles {
+sub GetTitles {
     my @borrowerTitle = split 
/,|\|/,C4::Context->preference('BorrowersTitles');
     unshift( @borrowerTitle, "" );
     return ( address@hidden);

Index: circ/circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- circ/circulation.pl 24 Apr 2007 13:54:29 -0000      1.109
+++ circ/circulation.pl 24 Apr 2007 15:41:27 -0000      1.110
@@ -141,7 +141,7 @@
 my $message;
 if ($findborrower) {
     my ( $count, $borrowers ) =
-      SearchBorrower($findborrower, 'cardnumber', 'web' );
+      SearchMember($findborrower, 'cardnumber', 'web' );
     my @borrowers = @$borrowers;
     if ( $#borrowers == -1 ) {
         $query->param( 'findborrower', '' );
@@ -163,7 +163,7 @@
 
 if ($borrowernumber) {
     $borrower = GetMemberDetails( $borrowernumber, 0 );
-    my ( $od, $issue, $fines ) = GetBorrowerIssuesAndFines( $borrowernumber );
+    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
 
     # Warningdate is the date that the warning starts appearing
     my ( $today_year,   $today_month,   $today_day )   = Today();
@@ -248,7 +248,7 @@
     }
     
 # FIXME If the issue is confirmed, we launch another time borrdata2, now 
display the issue count after issue 
-        my ( $od, $issue, $fines ) = GetBorrowerIssuesAndFines( 
$borrowernumber );
+        my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber 
);
         $template->param(
         issuecount   => $issue,
         );

Index: members/boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/boraccount.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- members/boraccount.pl       24 Apr 2007 13:54:29 -0000      1.7
+++ members/boraccount.pl       24 Apr 2007 15:41:27 -0000      1.8
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: boraccount.pl,v 1.7 2007/04/24 13:54:29 hdl Exp $
+# $Id: boraccount.pl,v 1.8 2007/04/24 15:41:27 hdl Exp $
 
 #writen 11/1/2000 by address@hidden
 #script to display borrowers account details
@@ -50,7 +50,7 @@
 my $data=GetMember($borrowernumber,'borrowernumber');
 
 #get account details
-my ($numaccts,$accts,$total)=GetBorrowerAcctRecord($borrowernumber);
+my ($numaccts,$accts,$total)=GetMemberAccountRecords($borrowernumber);
 my $totalcredit;
 if($total <= 0){
        $totalcredit = 1;

Index: members/guarantor_search.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/guarantor_search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- members/guarantor_search.pl 24 Apr 2007 13:54:29 -0000      1.5
+++ members/guarantor_search.pl 24 Apr 2007 15:41:27 -0000      1.6
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: guarantor_search.pl,v 1.5 2007/04/24 13:54:29 hdl Exp $
+# $Id: guarantor_search.pl,v 1.6 2007/04/24 15:41:27 hdl Exp $
 
 # script to find a guarantor
 
@@ -64,15 +64,15 @@
 if ($member ne ''){
        if(length($member) == 1)
        {
-               ($count,$results)=SearchBorrower($member,$orderby,"simple",'A');
+               ($count,$results)=SearchMember($member,$orderby,"simple",'A');
        }
        else
        {
-               
($count,$results)=SearchBorrower($member,$orderby,"advanced",'A');
+               ($count,$results)=SearchMember($member,$orderby,"advanced",'A');
        }
        for (my $i=0; $i < $count; $i++){
        #find out stats
-       my 
($od,$issue,$fines)=GetBorrowerIssuesAndFines($results->[$i]{'borrowerid'});
+       my 
($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowerid'});
        my $guarantorinfo=uc($results->[$i]{'surname'})." , 
".ucfirst($results->[$i]{'firstname'});
        my %row = (
                background => $background,

Index: members/memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- members/memberentry.pl      24 Apr 2007 13:54:29 -0000      1.43
+++ members/memberentry.pl      24 Apr 2007 15:41:27 -0000      1.44
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.43 2007/04/24 13:54:29 hdl Exp $
+# $Id: memberentry.pl,v 1.44 2007/04/24 15:41:27 hdl Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -325,7 +325,7 @@
 
        my $default_borrowertitle;
        $default_borrowertitle=$data{'title'} ;
-       my($borrowertitle)=GetBorrowersTitles();
+       my($borrowertitle)=GetTitles();
        my $borrotitlepopup = CGI::popup_menu(-name=>'title',
                                              -id => 'title',
                                              -values=>$borrowertitle,

Index: members/member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- members/member.pl   24 Apr 2007 13:54:29 -0000      1.18
+++ members/member.pl   24 Apr 2007 15:41:27 -0000      1.19
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: member.pl,v 1.18 2007/04/24 13:54:29 hdl Exp $
+# $Id: member.pl,v 1.19 2007/04/24 15:41:27 hdl Exp $
 
 #script to do a borrower enquiery/brin up borrower details etc
 #written 20/12/99 by address@hidden
@@ -71,11 +71,11 @@
 
 if(length($member) == 1)
 {
-    ($count,$results)=SearchBorrower($member,$orderby,"simple");
+    ($count,$results)=SearchMember($member,$orderby,"simple");
 }
 else
 {
-    ($count,$results)=SearchBorrower($member,$orderby,"advanced");
+    ($count,$results)=SearchMember($member,$orderby,"advanced");
 }
 
 
@@ -83,7 +83,7 @@
 my $background = 0;
 for (my $i=0; $i < $count; $i++){
   #find out stats
-  my 
($od,$issue,$fines)=GetBorrowerIssuesAndFines($results->[$i]{'borrowernumber'});
+  my 
($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowernumber'});
 
   my %row = (
     background => $background,

Index: members/moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- members/moremember.pl       24 Apr 2007 13:54:29 -0000      1.37
+++ members/moremember.pl       24 Apr 2007 15:41:27 -0000      1.38
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: moremember.pl,v 1.37 2007/04/24 13:54:29 hdl Exp $
+# $Id: moremember.pl,v 1.38 2007/04/24 15:41:27 hdl Exp $
 
 =head1 moremember.pl
 
@@ -192,7 +192,7 @@
   ( ( GetBranchDetail( $data->{'branchcode'} ) )->{'branchname'} );
 
 
-my ( $total, $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber );
+my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
 my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
 ( $template->param( lib1 => $lib1 ) ) if ($lib1);

Index: members/pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/pay.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- members/pay.pl      24 Apr 2007 13:54:29 -0000      1.12
+++ members/pay.pl      24 Apr 2007 15:41:27 -0000      1.13
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: pay.pl,v 1.12 2007/04/24 13:54:29 hdl Exp $
+# $Id: pay.pl,v 1.13 2007/04/24 15:41:27 hdl Exp $
 
 =head1 pay.pl
 
@@ -89,7 +89,7 @@
         recordpayment( $borrowernumber, $total );
     }
 
-    my ( $total, $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber );
+    my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber 
);
 
 #       creation d'une fonction qui va nous retourner le notify_id dans un 
tableau
 

Index: misc/notifys/fines.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/notifys/fines.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- misc/notifys/fines.pl       23 Apr 2007 13:10:08 -0000      1.7
+++ misc/notifys/fines.pl       24 Apr 2007 15:41:27 -0000      1.8
@@ -315,7 +315,7 @@
                                 $template->param(BOOKDETAILS => 
address@hidden);
                                 my %params;
                                 %params->{'borrowernumber'} = 
$overdue->{'borrowernumber'};
-                                my ($total, $acctlines, $count) = 
&GetBorrowerAcctRecord($overdue->{'borrowernumber'});
+                                my ($total, $acctlines, $count) = 
&GetMemberAccountRecords($overdue->{'borrowernumber'});
                                             $template->param(FINES_TOTAL => 
$total_fines);
                             $template->param(OWING => $total);
                             my $name= "$borrower->{'firstname'} 
$borrower->{'surname'}";

Index: opac/opac-account.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- opac/opac-account.pl        24 Apr 2007 13:54:29 -0000      1.15
+++ opac/opac-account.pl        24 Apr 2007 15:41:27 -0000      1.16
@@ -47,7 +47,7 @@
 $template->param( BORROWER_INFO => address@hidden );
 
 #get account details
-my ( $total , $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber );
+my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 
 for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
     $accts->[$i]{'date'} = format_date( $accts->[$i]{'date'} );

Index: opac/opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- opac/opac-user.pl   24 Apr 2007 13:54:29 -0000      1.29
+++ opac/opac-user.pl   24 Apr 2007 15:41:27 -0000      1.30
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-user.pl,v 1.29 2007/04/24 13:54:29 hdl Exp $
+# $Id: opac-user.pl,v 1.30 2007/04/24 15:41:27 hdl Exp $
 
 use strict;
 require Exporter;
@@ -92,7 +92,7 @@
         $issue->{'reserved'} = 1;
     }
     
-    my ( $total , $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber 
);
+    my ( $total , $accts, $numaccts) = GetMemberAccountRecords( 
$borrowernumber );
     my $charges = 0;
     foreach my $ac (@$accts) {
         if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {

Index: reserve/request.pl
===================================================================
RCS file: /cvsroot/koha/koha/reserve/request.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- reserve/request.pl  24 Apr 2007 13:54:30 -0000      1.13
+++ reserve/request.pl  24 Apr 2007 15:41:27 -0000      1.14
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.13 2007/04/24 13:54:30 hdl Exp $
+# $Id: request.pl,v 1.14 2007/04/24 15:41:27 hdl Exp $
 
 #writen 2/1/00 by address@hidden
 # Copyright 2000-2002 Katipo Communications
@@ -68,7 +68,7 @@
 
 if ($findborrower) {
     my ( $count, $borrowers ) =
-      SearchBorrower($findborrower, 'cardnumber', 'web' );
+      SearchMember($findborrower, 'cardnumber', 'web' );
 
     my @borrowers = @$borrowers;
 

Index: serials/distributedto.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/distributedto.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- serials/distributedto.pl    24 Apr 2007 13:54:30 -0000      1.7
+++ serials/distributedto.pl    24 Apr 2007 15:41:27 -0000      1.8
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: distributedto.pl,v 1.7 2007/04/24 13:54:30 hdl Exp $
+# $Id: distributedto.pl,v 1.8 2007/04/24 15:41:27 hdl Exp $
 
 =head1 NAME
 
@@ -79,7 +79,7 @@
                  debug => 1,
                  });
 
-my ($count,$results)=GetBorrowersFromSurname($searchfield) if $searchfield;
+my ($count,$results)=GetMembersFromSurname($searchfield) if $searchfield;
 my $toggle="0";
 my @loop_data =();
 for (my $i=0; $i < $count; $i++){

Index: serials/member-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/member-search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- serials/member-search.pl    24 Apr 2007 13:54:30 -0000      1.5
+++ serials/member-search.pl    24 Apr 2007 15:41:27 -0000      1.6
@@ -43,7 +43,7 @@
 );
 
 if ($searchstring) {
-    my ( $count, $members ) = &SearchBorrower( '', $searchstring, "surname" );
+    my ( $count, $members ) = &SearchMember( '', $searchstring, "surname" );
 
     $template->param(
         subscriptionid => $subscriptionid,