[Koha-cvs] koha/C4 Branch.pm Members.pm Serials.pm [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        07/01/12 18:10:19

Modified files:
        C4             : Branch.pm Members.pm Serials.pm 

Log message:
        some minor change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Branch.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.27&r2=1.32.2.28
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.22&r2=1.5.2.23

Patches:
Index: Branch.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Branch.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- Branch.pm   11 Jan 2007 15:30:52 -0000      1.1.2.3
+++ Branch.pm   12 Jan 2007 18:10:19 -0000      1.1.2.4
@@ -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: Branch.pm,v 1.1.2.3 2007/01/11 15:30:52 hdl Exp $
+# $Id: Branch.pm,v 1.1.2.4 2007/01/12 18:10:19 toins Exp $
 
 use strict;
 require Exporter;
@@ -25,7 +25,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.1.2.3 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.1.2.4 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -317,14 +317,11 @@
 
 $results = GetBranchInfo($branchcode);
 
-C<$results> is a ref to an array.
+returns C<$results>, a reference to an array of hashes containing branches.
 
 =cut
 
 sub GetBranchInfo {
-
-    # returns a reference to an array of hashes containing branches,
-
     my ($branchcode) = @_;
     my $dbh = C4::Context->dbh;
     my $sth;

Index: Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.27
retrieving revision 1.32.2.28
diff -u -b -r1.32.2.27 -r1.32.2.28
--- Members.pm  10 Jan 2007 16:31:15 -0000      1.32.2.27
+++ Members.pm  12 Jan 2007 18:10:19 -0000      1.32.2.28
@@ -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.32.2.27 2007/01/10 16:31:15 toins Exp $
+# $Id: Members.pm,v 1.32.2.28 2007/01/12 18:10:19 toins Exp $
 
 use strict;
 require Exporter;
@@ -30,7 +30,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.32.2.27 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.28 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -269,13 +269,11 @@
     }
     my $data = $sth->fetchrow_hashref;
 
-    #     warn "DATA" . $data->{category_type};
     $sth->finish;
     if ($data) {
         return ($data);
     }
-    else {    # try with firstname
-        if ($cardnumber) {
+    elsif ($cardnumber) {    # try with firstname
             my $sth =
               $dbh->prepare(
 "Select borrowers.*,categories.category_type from borrowers left join 
categories on borrowers.categorycode=categories.categorycode  where firstname=?"
@@ -285,8 +283,9 @@
             $sth->finish;
             return ($data);
         }
-    }
+    else {
     return undef;
+    }
 }
 
 =item borrdata2

Index: Serials.pm
===================================================================
RCS file: /sources/koha/koha/C4/Serials.pm,v
retrieving revision 1.5.2.22
retrieving revision 1.5.2.23
diff -u -b -r1.5.2.22 -r1.5.2.23
--- Serials.pm  11 Jan 2007 15:30:52 -0000      1.5.2.22
+++ Serials.pm  12 Jan 2007 18:10:19 -0000      1.5.2.23
@@ -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: Serials.pm,v 1.5.2.22 2007/01/11 15:30:52 hdl Exp $
+# $Id: Serials.pm,v 1.5.2.23 2007/01/12 18:10:19 toins Exp $
 
 use strict;
 use C4::Date;
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.5.2.22 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.5.2.23 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -1180,7 +1180,7 @@
     my $rows=$sth->rows;
     $sth->finish;
     
-    
&logaction(C4::Context->userenv->{'number'},"SUBSCRIPTION","MODIFY",$subscriptionid,"")
 
+    
&logaction(C4::Context->userenv->{'number'},"SERIAL","MODIFY",$subscriptionid,"")
 
         if C4::Context->preference("SubscriptionLog");
     return $rows;
 }
@@ -1292,7 +1292,7 @@
         format_date_in_iso($startdate)
     );
     
-    
&logaction(C4::Context->userenv->{'number'},"SUBSCRIPTION","ADD",$subscriptionid,"")
 
+    
&logaction(C4::Context->userenv->{'number'},"SERIAL","ADD",$subscriptionid,"") 
         if C4::Context->preference("SubscriptionLog");
     
     return $subscriptionid;
@@ -1344,7 +1344,7 @@
     $sth->execute( format_date_in_iso($startdate),
         $numberlength, $weeklength, $monthlength, $subscriptionid );
         
-    
&logaction(C4::Context->userenv->{'number'},"SUBSCRIPTION","RENEW",$subscriptionid,"")
 
+    
&logaction(C4::Context->userenv->{'number'},"SERIAL","RENEW",$subscriptionid,"")
 
         if C4::Context->preference("SubscriptionLog");
 }
 
@@ -1705,7 +1705,7 @@
         "DELETE FROM subscriptionhistory WHERE 
subscriptionid=$subscriptionid");
     $dbh->do("DELETE FROM serial WHERE subscriptionid=$subscriptionid");
     
-    
&logaction(C4::Context->userenv->{'number'},"SUBSCRIPTION","DELETE",$subscriptionid,"")
 
+    
&logaction(C4::Context->userenv->{'number'},"SERIAL","DELETE",$subscriptionid,"")
 
         if C4::Context->preference("SubscriptionLog");
 }