[Koha-cvs] koha C4/Biblio.pm C4/Koha.pm circ/branchreserve... [rel_3_0]

[LAURIN arnaud]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     LAURIN arnaud <alaurin> 06/08/31 09:59:23

Modified files:
        C4             : Biblio.pm Koha.pm 
        circ           : branchreserves.pl 

Log message:
        bugfixing for the branchreserves.pl program
        
        restore the fonctions : 
        
        - get_item_infos_of
        - get_infos_of
        - get_biblioiteminfos_of
        
        and remove the %env variable . in branchreserves.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.2&r2=1.178.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.1&r2=1.40.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchreserves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2

Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.2
retrieving revision 1.178.2.3
diff -u -b -r1.178.2.2 -r1.178.2.3
--- C4/Biblio.pm        29 Aug 2006 09:39:39 -0000      1.178.2.2
+++ C4/Biblio.pm        31 Aug 2006 09:59:23 -0000      1.178.2.3
@@ -26,6 +26,7 @@
 use MARC::File::XML;
 use ZOOM;
 use Data::Dumper;
+use C4::Koha;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
@@ -80,6 +81,8 @@
   &char_decode
   &DisplayISBN
 &itemcalculator &calculatelc
+&get_iteminfos_of
+&get_biblioiteminfos_of
 );
 
 #
@@ -3126,7 +3129,30 @@
 
 }
 
+sub get_iteminfos_of {
+    my @itemnumbers = @_;
 
+    my $query = '
+SELECT *
+  FROM items
+  WHERE itemnumber IN ('.join(',', @itemnumbers).')
+';
+    return get_infos_of($query, 'itemnumber');
+}
+
+sub get_biblioiteminfos_of {
+    my @biblioitemnumbers = @_;
+
+    my $query = '
+SELECT biblioitemnumber,
+       publicationyear,
+       itemtype
+  FROM biblioitems
+  WHERE biblioitemnumber IN ('.join(',', @biblioitemnumbers).')
+';
+
+    return get_infos_of($query, 'biblioitemnumber');
+}
 
 
 END { }    # module clean-up code here (global destructor)
@@ -3141,8 +3167,19 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.178.2.2 2006/08/29 09:39:39 toins Exp $
+# $Id: Biblio.pm,v 1.178.2.3 2006/08/31 09:59:23 alaurin Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.178.2.3  2006/08/31 09:59:23  alaurin
+# bugfixing for the branchreserves.pl program
+#
+# restore the fonctions :
+#
+# - get_item_infos_of
+# - get_infos_of
+# - get_biblioiteminfos_of
+#
+# and remove the %env variable . in branchreserves.pl
+#
 # Revision 1.178.2.2  2006/08/29 09:39:39  toins
 # ItemInfo renamed to GetItemsInfo and moved from Search.pm to Biblio.pm
 #

Index: C4/Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -b -r1.40.2.1 -r1.40.2.2
--- C4/Koha.pm  29 Aug 2006 07:27:13 -0000      1.40.2.1
+++ C4/Koha.pm  31 Aug 2006 09:59:23 -0000      1.40.2.2
@@ -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: Koha.pm,v 1.40.2.1 2006/08/29 07:27:13 toins Exp $
+# $Id: Koha.pm,v 1.40.2.2 2006/08/31 09:59:23 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -25,7 +25,7 @@
 
 use vars qw($VERSION @ISA @EXPORT);
 
-$VERSION = do { my @v = '$Revision: 1.40.2.1 $' =~ /\d+/g; shift(@v) . "." . 
join("_", map {sprintf "%03d", $_ } @v); };
+$VERSION = do { my @v = '$Revision: 1.40.2.2 $' =~ /\d+/g; shift(@v) . "." . 
join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
 
@@ -67,6 +67,7 @@
                         get_branchinfos_of
                         get_notforloan_label_of
                         get_infos_of
+                        &get_itemtypeinfos_of
             $DEBUG);
 
 use vars qw();

Index: circ/branchreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchreserves.pl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- circ/branchreserves.pl      30 Aug 2006 16:38:51 -0000      1.2.2.1
+++ circ/branchreserves.pl      31 Aug 2006 09:59:23 -0000      1.2.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: branchreserves.pl,v 1.2.2.1 2006/08/30 16:38:51 toins Exp $
+# $Id: branchreserves.pl,v 1.2.2.2 2006/08/31 09:59:23 alaurin Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -98,11 +98,12 @@
        }
        
 my @reservloop;
+warn "retour default ->".$default;
 my @getreserves = GetReservesForBranch($default);
 foreach my $num (@getreserves) {
        my %getreserv;
        my %env;
-       my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
+       my $gettitle = getiteminformation($num->{'itemnumber'});
        my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
        my $itemtypeinfo = getitemtypeinfo($gettitle->{'itemtype'});
        $getreserv{'waitingdate'} = format_date($num->{'waitingdate'});