[Koha-patches] [PATCH] perltidy finishreceive.pl and two comments added

Joe Atzberger joe.atzberger at liblime.com
Wed Apr 8 00:37:50 CEST 2009


---
 acqui/finishreceive.pl |  100 ++++++++++++++++++++++++-----------------------
 1 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 8cb5bf2..c9a112e 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -3,7 +3,6 @@
 #script to add a new item and to mark orders as received
 #written 1/3/00 by chris at katipo.co.nz
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -22,6 +21,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+# use warnings; # FIXME
 use CGI;
 use C4::Auth;
 use C4::Output;
@@ -31,70 +31,72 @@ use C4::Biblio;
 use C4::Items;
 use C4::Search;
 
-my $input=new CGI;
-my $flagsrequired = { acquisition => 1};
+my $input = new CGI;
+my $flagsrequired = { acquisition => 1 };
 my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet');
-my $user=$input->remote_user;
-my $biblionumber = $input->param('biblionumber');
-my $biblioitemnumber=$input->param('biblioitemnumber');
-my $ordnum=$input->param('ordnum');
-my $origquantityrec=$input->param('origquantityrec');
-my $quantityrec=$input->param('quantityrec');
-my $quantity=$input->param('quantity');
-my $cost=$input->param('cost');
-my $invoiceno=$input->param('invoice');
-my $datereceived=$input->param('datereceived');
-my $replacement=$input->param('rrp');
-my $gst=$input->param('gst');
-my $freight=$input->param('freight');
-my $supplierid = $input->param('supplierid');
-my @branch=$input->param('homebranch');
-my @barcode=$input->param('barcode');
-my @ccode=$input->param('ccode');
-my @itemtype=$input->param('itemtype');
-my @location=$input->param('location');
-my @enumchron=$input->param('volinf');
-my $cnt=0;
-my $error_url_str;	
+my $user             = $input->remote_user;     # FIXME: surely outmoded now
+my $biblionumber     = $input->param('biblionumber');
+my $biblioitemnumber = $input->param('biblioitemnumber');
+my $ordnum           = $input->param('ordnum');
+my $origquantityrec  = $input->param('origquantityrec');
+my $quantityrec      = $input->param('quantityrec');
+my $quantity         = $input->param('quantity');
+my $cost             = $input->param('cost');
+my $invoiceno        = $input->param('invoice');
+my $datereceived     = $input->param('datereceived');
+my $replacement      = $input->param('rrp');
+my $gst              = $input->param('gst');
+my $freight          = $input->param('freight');
+my $supplierid       = $input->param('supplierid');
+my @branch           = $input->param('homebranch');
+my @barcode          = $input->param('barcode');
+my @ccode            = $input->param('ccode');
+my @itemtype         = $input->param('itemtype');
+my @location         = $input->param('location');
+my @enumchron        = $input->param('volinf');
+my $cnt              = 0;
+my $error_url_str;
 
-if ($quantityrec > $origquantityrec ) {
-	foreach my $bc (@barcode) {
+if ($quantityrec > $origquantityrec) {
+    foreach my $bc (@barcode) {
         if ($bc) {
             my $item_hash = {
-                        "items.replacementprice" => $replacement,
-                        "items.price"            => $cost,
-                        "items.booksellerid"     => $supplierid,
-                        "items.homebranch"       => $branch[$cnt],
-                        "items.holdingbranch"    => $branch[$cnt],
-                        "items.barcode"          => $barcode[$cnt],
-                        "items.ccode"          => $ccode[$cnt],
-                        "items.itype"          => $itemtype[$cnt],
-                        "items.location"          => $location[$cnt],
-                        "items.enumchron"          => $enumchron[$cnt], # FIXME : No integration here with serials module.
-                        "items.loan"             => 0, 
-                        };
-            $item_hash->{'items.cn_source'} = C4::Context->preference('DefaultClassificationSource') if(C4::Context->preference('DefaultClassificationSource') );
+                "items.replacementprice" => $replacement,
+                "items.price"            => $cost,
+                "items.booksellerid"     => $supplierid,
+                "items.homebranch"       => $branch[$cnt],
+                "items.holdingbranch"    => $branch[$cnt],
+                "items.barcode"          => $barcode[$cnt],
+                "items.ccode"            => $ccode[$cnt],
+                "items.itype"            => $itemtype[$cnt],
+                "items.location"         => $location[$cnt],
+                "items.enumchron"        => $enumchron[$cnt],    # FIXME : No integration here with serials module.
+                "items.loan"             => 0,
+            };
+            $item_hash->{'items.cn_source'} = C4::Context->preference('DefaultClassificationSource') if (C4::Context->preference('DefaultClassificationSource'));
+
             # FIXME : cn_sort is populated by Items::_set_derived_columns_for_add , which is never called with AddItemFromMarc .  Bug 2403
             my $itemRecord = TransformKohaToMarc($item_hash);
             $cnt++;
-            $item_hash = TransformMarcToKoha(undef,$itemRecord,'','items');
+            $item_hash = TransformMarcToKoha(undef, $itemRecord, '', 'items');
+
             # FIXME: possible race condition.  duplicate barcode check should happen in AddItem, but for now we have to do it here.
             my %err = CheckItemPreSave($item_hash);
-            if(%err) {
+            if (%err) {
                 for my $err_cnd (keys %err) {
                     $error_url_str .= "&error=" . $err_cnd . "&error_param=" . $err{$err_cnd};
                 }
                 $quantityrec--;
             } else {
-                AddItemFromMarc($itemRecord,$biblionumber);
+                AddItemFromMarc($itemRecord, $biblionumber);
             }
         }
-	}
-	
+    }
+
     # save the quantity received.
-	if( $quantityrec > 0 ) {
-    	$datereceived = ModReceiveOrder($biblionumber,$ordnum, $quantityrec ,$user,$cost,$invoiceno,$freight,$replacement,undef,$datereceived);
-	}
+    if ($quantityrec > 0) {
+        $datereceived = ModReceiveOrder($biblionumber, $ordnum, $quantityrec, $user, $cost, $invoiceno, $freight, $replacement, undef, $datereceived);
+    }
 }
-    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
+print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
 
-- 
1.5.6.5



More information about the Koha-patches mailing list