From a0004d6bd79b7956f4e8eb7e0857e70c1f1c1158 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 9 Dec 2022 16:18:40 +0000
Subject: [PATCH] Bug 32437: Cleanup script

This patch:
- fixes some indentation
- flips unless-else to if-else for readability
- expands some comments for clarity
- removes unused biblioitemnum variable

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b68a6b32974cb1891fa61c7b52680880e5695a27)
Signed-off-by: Jacob O'Mara <jacobomara901@gmail.com>
---
 acqui/addorderiso2709.pl | 60 +++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index b18e68806b..eefcabcf4a 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -169,7 +169,9 @@ if ($op eq ""){
         my $c_price = shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
 
         # Insert the biblio, or find it through matcher
-        unless ( $biblionumber ) {
+        if ( $biblionumber ) { # If matched during staging we can continue
+            $import_record->status('imported')->store;
+        } else { # Otherwise we check for duplicates, and skip if they exist
             if ($matcher_id) {
                 if ( $matcher_id eq '_TITLE_AUTHOR_' ) {
                     $duplifound = 1 if FindDuplicate($marcrecord);
@@ -183,10 +185,8 @@ if ($op eq ""){
                 $duplinbatch = $import_batch_id and next if $duplifound;
             }
 
-            # add the biblio
-            my $bibitemnum;
-
-            # remove ISBN -
+            # remove hyphens (-) from ISBN
+            # FIXME: This should probably be optional
             my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn' );
             if ( $marcrecord->field($isbnfield) ) {
                 foreach my $field ( $marcrecord->field($isbnfield) ) {
@@ -197,9 +197,9 @@ if ($op eq ""){
                     }
                 }
             }
-            ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
-            $import_record->status('imported')->store;
-        } else {
+
+            # add the biblio
+            ( $biblionumber, undef ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
             $import_record->status('imported')->store;
         }
 
@@ -334,30 +334,28 @@ if ($op eq ""){
                 $orderinfo{listprice} = 0;
             }
 
-        # remove uncertainprice flag if we have found a price in the MARC record
-        $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
-
-        my $order = Koha::Acquisition::Order->new( \%orderinfo );
-        $order->populate_with_prices_for_ordering();
-        $order->populate_with_prices_for_receiving();
-        $order->store;
-
-        # 4th, add items if applicable
-        # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
-        # this is not optimised, but it's working !
-        if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) {
-            my @tags         = $input->multi_param('tag');
-            my @subfields    = $input->multi_param('subfield');
-            my @field_values = $input->multi_param('field_value');
-            my @serials      = $input->multi_param('serial');
-            my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values );
-            my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
-            for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
-                my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
-                $order->add_item( $itemnumber );
+            # remove uncertainprice flag if we have found a price in the MARC record
+            $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
+
+            my $order = Koha::Acquisition::Order->new( \%orderinfo );
+            $order->populate_with_prices_for_ordering();
+            $order->populate_with_prices_for_receiving();
+            $order->store;
+
+            # 4th, add items if applicable
+            # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
+            # this is not optimised, but it's working !
+            if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) {
+                my @tags         = $input->multi_param('tag');
+                my @subfields    = $input->multi_param('subfield');
+                my @field_values = $input->multi_param('field_value');
+                my @serials      = $input->multi_param('serial');
+                my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values );
+                my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
+                for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
+                    my ( $biblionumber, undef, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
+                    $order->add_item( $itemnumber );
                 }
-            } else {
-                $import_record->status( 'imported' )->store;
             }
         }
         $imported++;
-- 
2.39.5