Attachment 750 Details for Bug 2593 – Patch for head

[patch] Patch for head

0001-Bug-2593-way-to-duplicate-items.patch (text/plain), 9.04 KB, created by Chris Cormack on 2009-07-17 15:28:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2009-07-17 15:28:00 UTC

Size: 9.04 KB

patch

obsolete

>From d4e02a668860007c067fe5ffa49248e3a4afd06b Mon Sep 17 00:00:00 2001
>From: Matthias Meusburger <matthias.meusburger@biblibre.com>
>Date: Fri, 17 Jul 2009 17:12:12 +0200
>Subject: [PATCH] Bug 2593 : way to duplicate items
>
>---
> cataloguing/additem.pl                             |  103 ++++++++++++++++++--
> .../prog/en/modules/cataloguing/additem.tmpl       |   24 +++++-
> 2 files changed, 119 insertions(+), 8 deletions(-)
>
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index f11380a..f98ee55 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -97,6 +97,13 @@ if ($op eq "additem") {
>     my @indicator = $input->param('indicator');
>     my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM');
>     my $record = MARC::Record::new_from_xml($xml, 'UTF-8');
>+
>+    # type of add
>+    my $add_submit                 = $input->param('add_submit');
>+    my $add_duplicate_submit       = $input->param('add_duplicate_submit');
>+    my $add_multiple_copies_submit = $input->param('add_multiple_copies_submit');
>+    my $number_of_copies           = $input->param('number_of_copies');
>+
>     # if autoBarcode is set to 'incremental', calculate barcode...
> 	# NOTE: This code is subject to change in 3.2 with the implemenation of ajax based autobarcode code
> 	# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
>@@ -114,16 +121,98 @@ if ($op eq "additem") {
>             $record->insert_fields_ordered($fieldItem);
>         }
>     }
>-# check for item barcode # being unique
>+
>     my $addedolditem = TransformMarcToKoha($dbh,$record);
>-    my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'});
>-    push @errors,"barcode_not_unique" if($exist_itemnumber);
>-    # if barcode exists, don't create, but report The problem.
>-    my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber) unless ($exist_itemnumber);
>-    $nextop = "additem";
>-    if ($exist_itemnumber) {
>+
>+    # If we have to add or add & duplicate, we add the item
>+    if ($add_submit || $add_duplicate_submit) {
>+	# check for item barcode # being unique
>+	my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'});
>+	push @errors,"barcode_not_unique" if($exist_itemnumber);
>+	# if barcode exists, don't create, but report The problem.
>+	my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber) unless ($exist_itemnumber);
>+	$nextop = "additem";
>+	if ($exist_itemnumber) {
>+	    $itemrecord = $record;
>+	}
>+    }
>+
>+    # If we have to add & duplicate
>+    if ($add_duplicate_submit) {
>+
>+        # We try to get the next barcode
>+        use C4::Barcodes;
>+        my $barcodeobj = C4::Barcodes->new;
>+        my $barcodevalue = $barcodeobj->next_value($addedolditem->{'barcode'}) if $barcodeobj;
>+        my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
>+        if ($record->field($tagfield)->subfield($tagsubfield)) {
>+            # If we got the next codebar value, we put it in the record
>+            if ($barcodevalue) {
>+                $record->field($tagfield)->update($tagsubfield => $barcodevalue);
>+            # If not, we delete the recently inserted barcode from the record (so the user can input a barcode himself)
>+            } else {
>+                $record->field($tagfield)->update($tagsubfield => '');
>+            }
>+        }
>         $itemrecord = $record;
>     }
>+
>+    # If we have to add multiple copies
>+    if ($add_multiple_copies_submit) {
>+
>+        use C4::Barcodes;
>+        my $barcodeobj = C4::Barcodes->new;
>+        my $oldbarcode = $addedolditem->{'barcode'};
>+        my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
>+
>+	# If there is a barcode and we can't find him new values, we can't add multiple copies
>+        my $testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj;
>+	if ($oldbarcode && !$testbarcode) {
>+
>+	    push @errors, "no_next_barcode";
>+	    $itemrecord = $record;
>+
>+	} else {
>+	# We add each item
>+
>+	    # For the first iteration
>+	    my $barcodevalue = $oldbarcode;
>+	    my $exist_itemnumber;
>+
>+
>+	    for (my $i = 0; $i < $number_of_copies;) {
>+
>+		# If there is a barcode
>+		if ($barcodevalue) {
>+
>+		    # Getting a new barcode (if it is not the first iteration or the barcode we tried already exists)
>+		    $barcodevalue = $barcodeobj->next_value($oldbarcode) if ($i > 0 || $exist_itemnumber);
>+
>+		    # Putting it into the record
>+		    if ($barcodevalue) {
>+			$record->field($tagfield)->update($tagsubfield => $barcodevalue);
>+		    }
>+
>+		    # Checking if the barcode already exists
>+		    $exist_itemnumber = get_item_from_barcode($barcodevalue);
>+		}
>+
>+		# Adding the item
>+		my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber) unless ($exist_itemnumber);
>+
>+		# We count the item only if it was really added
>+		# That way, all items are added, even if there was some already existing barcodes
>+		# FIXME : Please note that there is a risk of infinite loop here if we never find a suitable barcode
>+		$i++ unless ($exist_itemnumber);
>+
>+		# Preparing the next iteration
>+		$oldbarcode = $barcodevalue;
>+	    }
>+	    undef($itemrecord);
>+	}
>+    }
>+
>+
> #-------------------------------------------------------------------------------
> } elsif ($op eq "edititem") {
> #-------------------------------------------------------------------------------
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
>index ca745e4..5b43114 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
>@@ -23,6 +23,7 @@ function active(numlayer)
>     }
> }
> function Check(f) {
>+
>     var total_errors=0;
> //	alert(f.field_value.length);
>     for (i=0 ; i<f.field_value.length ; i++) {
>@@ -45,6 +46,13 @@ function Check(f) {
>         return false;
>     }
> }
>+function CheckMultipleAdd(f) {
>+
>+    if (!f || isNaN(f) || !parseInt(f) == f || f <= 0) { 
>+	alert(_("Please enter a number of items to create.")); 
>+	return false;	
>+    }
>+}
> function Dopop(link,i) {
>     defaultvalue=document.forms[0].field_value[i].value;
>     newin=window.open(link+"&result="+defaultvalue,"valuebuilder",'width=500,height=400,toolbar=false,scrollbars=yes');
>@@ -169,6 +177,7 @@ function set_to_today(id, force) {
> <h1>Items for   by  (Record #)</h1>
> 
> <div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>
>+<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>
> <div class="dialog alert"><strong>Cannot Delete</strong>: item is checked out.</div>
> <div class="dialogalert"><strong>Cannot Delete</strong>: item has a waiting hold.</div>
> 
>@@ -230,7 +239,20 @@ function set_to_today(id, force) {
>     <input type="hidden" name="itemnumber" value="" />
> 
> <fieldset class="action">    
>-    <input type="submit" value="Add item" onclick="return Check(this.form)" />
>+    <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
>+    
>+
>+    <input type="submit" name="add_submit" value="Add item" onclick="return Check(this.form)" />
>+    <input type="submit" name="add_duplicate_submit" value="Add &amp; Duplicate" onclick="return Check(this.form)" />
>+    <input type="submit" name="add_multiple_copies" value="Add Multiple Copies" onclick="javascript:this.nextSibling.style.visibility='visible';document.f.number_of_copies.focus(); return false;" /><span id="add_multiple_copies_span" style="visibility:hidden">
>+	<label for="number_of_copies">Number of copies to add : </label>
>+	<input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" />
>+	<input type="submit" id="add_multiple_copies_submit" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) &amp;&amp; CheckMultipleAdd(this.form.number_of_copies.value);" />
>+    </span>
>+
>     
>     <input type="hidden" name="tag" value="" />
>     <input type="hidden" name="subfield" value="" />
>-- 
>1.6.0.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 2593: 750