[Koha-cvs] koha C4/Biblio.pm C4/Circulation.pm C4/Reserves...

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/04/24 09:07:53

Modified files:
        C4             : Biblio.pm Circulation.pm Reserves.pm 
        circ           : transferstodo.pl waitingreserves.pl 
        members        : moremember.pl 

Log message:
        moving dotransfer to Biblio.pm::ModItemTransfer + some CheckReserves 
fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves.pm?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/circ/transferstodo.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreserves.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.35&r2=1.36

Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- C4/Biblio.pm        23 Apr 2007 15:21:17 -0000      1.198
+++ C4/Biblio.pm        24 Apr 2007 09:07:53 -0000      1.199
@@ -33,7 +33,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.198 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.199 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -81,6 +81,7 @@
 push @EXPORT, qw(
   &ModBiblio
   &ModItem
+  &ModItemTransfer
   &ModBiblioframework
   &ModZebra
   &ModItemInMarc
@@ -420,6 +421,47 @@
     }
 }
 
+sub ModItemTransfer {
+    my ( $itemnumber, $frombranch, $tobranch ) = @_;
+    
+    my $dbh = C4::Context->dbh;
+    
+    #new entry in branchtransfers....
+    my $sth = $dbh->prepare(
+        "INSERT INTO branchtransfers (itemnumber, frombranch, datesent, 
tobranch)
+        VALUES (?, ?, now(), $?)");
+    $sth->execute($itemnumber, $frombranch, $tobranch);
+    #update holdingbranch in items .....
+     $sth= $dbh->prepare(
+          "UPDATE items set holdingbranch = ? WHERE items.itemnumber = ?");
+    $sth->execute($tobranch,$itemnumber);
+    &ModDateLastSeen($itemnumber);
+    $sth = $dbh->prepare(
+        "SELECT biblionumber FROM items WHERE itemnumber=?"
+      );
+    $sth->execute($itemnumber);
+    while ( my ( $biblionumber ) = $sth->fetchrow ) {
+        &ModItemInMarconefield( $biblionumber, $itemnumber,
+            'items.holdingbranch', $tobranch );
+    }
+    return;
+}
+
+##New sub to dotransfer in marc tables as well. Not exported -TG 10/04/2006
+# sub domarctransfer {
+#     my ( $dbh, $itemnumber ) = @_;
+#     $itemnumber =~ s /\'//g;    ##itemnumber seems to come with quotes-TG
+#     my $sth =
+#       $dbh->prepare(
+#         "select biblionumber,holdingbranch from items where 
itemnumber=$itemnumber"
+#       );
+#     $sth->execute();
+#     while ( my ( $biblionumber, $holdingbranch ) = $sth->fetchrow ) {
+#         &ModItemInMarconefield( $biblionumber, $itemnumber,
+#             'items.holdingbranch', $holdingbranch );
+#     }
+#     return;
+# }
 =head2 ModBiblioframework
 
 =over
@@ -760,7 +802,7 @@
         if ( $datedue eq '' ) {
             #$datedue="Available";
             my ( $restype, $reserves ) =
-              CheckReserves( $data->{'itemnumber'} );
+              C4::Reserves::CheckReserves( $data->{'itemnumber'} );
             if ($restype) {
 
                 #$datedue=$restype;
@@ -3647,8 +3689,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.198 2007/04/23 15:21:17 tipaul Exp $
+# $Id: Biblio.pm,v 1.199 2007/04/24 09:07:53 tipaul Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.199  2007/04/24 09:07:53  tipaul
+# moving dotransfer to Biblio.pm::ModItemTransfer + some CheckReserves fixes
+#
 # Revision 1.198  2007/04/23 15:21:17  tipaul
 # renaming currenttransfers to transferstoreceive
 #

Index: C4/Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- C4/Circulation.pm   23 Apr 2007 15:21:17 -0000      1.18
+++ C4/Circulation.pm   24 Apr 2007 09:07:53 -0000      1.19
@@ -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: Circulation.pm,v 1.18 2007/04/23 15:21:17 tipaul Exp $
+# $Id: Circulation.pm,v 1.19 2007/04/24 09:07:53 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -43,11 +43,11 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.18 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.19 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
-C4::Circulation::Circ2 - Koha circulation module
+C4::Circulation - Koha circulation module
 
 =head1 SYNOPSIS
 
@@ -98,11 +98,6 @@
   &DeleteTransfer
 );
 
-# subs to remove
-push @EXPORT, qw(
-  &dotransfer
-);
-
 # FIXME - At least, I'm pretty sure this is for decoding CueCat stuff.
 # FIXME From Paul : i don't understand what this sub does & why it has to be 
called on every circ. Speak of this with chris maybe ?
 
@@ -274,7 +269,7 @@
 
     #actually do the transfer....
     if ($dotransfer) {
-        dotransfer( $itemnumber, $fbr, $tbr );
+        ModItemTransfer( $itemnumber, $fbr, $tbr );
 
         # don't need to update MARC anymore, we do it in batch now
         $messages->{'WasTransfered'} = 1;
@@ -282,44 +277,6 @@
     return ( $dotransfer, $messages, $biblio );
 }
 
-sub dotransfer {
-    my ( $itm, $fbr, $tbr ) = @_;
-    
-    my $dbh = C4::Context->dbh;
-    $itm = $dbh->quote($itm);
-    $fbr = $dbh->quote($fbr);
-    $tbr = $dbh->quote($tbr);
-    
-    #new entry in branchtransfers....
-    $dbh->do(
-"INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
-                    VALUES ($itm, $fbr, now(), $tbr)"
-    );
-
-    #update holdingbranch in items .....
-      $dbh->do(
-          "UPDATE items set holdingbranch = $tbr WHERE items.itemnumber = 
$itm");
-    &ModDateLastSeen($itm);
-    &domarctransfer( $dbh, $itm );
-    return;
-}
-
-##New sub to dotransfer in marc tables as well. Not exported -TG 10/04/2006
-sub domarctransfer {
-    my ( $dbh, $itemnumber ) = @_;
-    $itemnumber =~ s /\'//g;    ##itemnumber seems to come with quotes-TG
-    my $sth =
-      $dbh->prepare(
-        "select biblionumber,holdingbranch from items where 
itemnumber=$itemnumber"
-      );
-    $sth->execute();
-    while ( my ( $biblionumber, $holdingbranch ) = $sth->fetchrow ) {
-        &ModItemInMarconefield( $biblionumber, $itemnumber,
-            'items.holdingbranch', $holdingbranch );
-    }
-    return;
-}
-
 =head2 CanBookBeIssued
 
 Check if a book can be issued.
@@ -1324,7 +1281,7 @@
         
         if ( ($iteminformation->{'holdingbranch'} ne 
$iteminformation->{'homebranch'}) and not $messages->{'WrongTransfer'} and 
($validTransfert ne 1) and ($reserveDone ne 1) ){
                     if (C4::Context->preference("AutomaticItemReturn") == 1) {
-                    dotransfer($iteminformation->{'itemnumber'}, 
C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'});
+                    ModItemTransfer($iteminformation->{'itemnumber'}, 
C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'});
                     $messages->{'WasTransfered'} = 1;
                     warn "was transfered";
                     }
@@ -1989,7 +1946,7 @@
                $sth->finish;
 
 # second step create a new line of branchtransfer to the right location .
-       dotransfer($itemNumber, $FromLibrary, $waitingAtLibrary);
+       ModItemTransfer($itemNumber, $FromLibrary, $waitingAtLibrary);
 
 #third step changing holdingbranch of item
        UpdateHoldingbranch($FromLibrary,$itemNumber);

Index: C4/Reserves.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- C4/Reserves.pm      23 Apr 2007 15:21:17 -0000      1.9
+++ C4/Reserves.pm      24 Apr 2007 09:07:53 -0000      1.10
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Reserves.pm,v 1.9 2007/04/23 15:21:17 tipaul Exp $
+# $Id: Reserves.pm,v 1.10 2007/04/24 09:07:53 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -33,7 +33,7 @@
 my $library_name = C4::Context->preference("LibraryName");
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.9 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.10 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -129,7 +129,7 @@
             );
 
             #launch the subroutine dotransfer
-            C4::Circulation::dotransfer(
+            C4::Circulation::ModItemTransfer(
                 $itemnumber,
                 $iteminfo->{'holdingbranch'},
                 $checkreserves->{'branchcode'}

Index: circ/transferstodo.pl
===================================================================
RCS file: /sources/koha/koha/circ/transferstodo.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- circ/transferstodo.pl       23 Apr 2007 16:42:59 -0000      1.1
+++ circ/transferstodo.pl       24 Apr 2007 09:07:53 -0000      1.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: transferstodo.pl,v 1.1 2007/04/23 16:42:59 tipaul Exp $
+# $Id: transferstodo.pl,v 1.2 2007/04/24 09:07:53 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -65,7 +65,7 @@
 
 # If we have a return of the form dotransfer, we launch the subroutine 
dotransfer
 if ($item) {
-    C4::Circulation::Circ2::dotransfer( $item, $fbr, $tbr );
+    C4::Circulation::Circ2::ModItemTransfer( $item, $fbr, $tbr );
 }
 
 # get the all the branches for reference

Index: circ/waitingreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/waitingreserves.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- circ/waitingreserves.pl     23 Apr 2007 16:42:59 -0000      1.1
+++ circ/waitingreserves.pl     24 Apr 2007 09:07:53 -0000      1.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: waitingreserves.pl,v 1.1 2007/04/23 16:42:59 tipaul Exp $
+# $Id: waitingreserves.pl,v 1.2 2007/04/24 09:07:53 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -104,7 +104,7 @@
 
 #              if the document is not in his homebranch location and there is 
not reservation after, we transfer it
     if ( ( $fbr ne $tbr ) and ( not $nextreservinfo ) ) {
-        dotransfer( $item, $fbr, $tbr );
+        ModItemTransfer( $item, $fbr, $tbr );
     }
 }
 

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- members/moremember.pl       23 Apr 2007 15:21:18 -0000      1.35
+++ members/moremember.pl       24 Apr 2007 09:07:53 -0000      1.36
@@ -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.35 2007/04/23 15:21:18 tipaul Exp $
+# $Id: moremember.pl,v 1.36 2007/04/24 09:07:53 tipaul Exp $
 
 =head1 moremember.pl
 
@@ -47,6 +47,7 @@
 use C4::Koha;
 use C4::Letters;
 use C4::Biblio;
+use C4::Reserves;
 use C4::Branch; # GetBranchName
 
 my $dbh = C4::Context->dbh;