reindenting & removing comments

[koha.git] / labels / label-edit-batch.pl

diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 0a9877b..35c38fb 100755 (executable)
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -22,18 +22,11 @@ use strict;
 use warnings;
 use vars qw($debug);
 
-use Sys::Syslog qw(syslog);
-use Switch qw(Perl6);
 use CGI;
-use HTML::Template::Pro;
-use Data::Dumper;
-use JSON;
 
-use C4::Auth;
-use C4::Output;
-use C4::Context;
+use C4::Auth qw(get_template_and_user);
+use C4::Output qw(output_html_with_http_headers);
 use C4::Branch qw(get_branch_code_from_name);
-use C4::Debug;
 use C4::Labels::Lib 1.000000 qw(get_label_summary html_table);
 use C4::Labels::Batch 1.000000;
 
@@ -48,8 +41,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
+
 my $err = 0;
 my $errstr = undef;
+my $duplicate_count = undef;
+my $duplicate_message = undef;
 my $db_rows = {};
 my $batch = undef;
 my $display_columns = [ {_label_number  => {label => 'Label Number', link_field => 0}},
@@ -58,10 +54,11 @@ my $display_columns = [ {_label_number  => {label => 'Label Number', link_field
                         {_barcode       => {label => 'Barcode', link_field => 0}},
                         {select         => {label => 'Select', value => '_label_id'}},
                       ];
-my $op = $cgi->param('op') || undef;
-my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');
+my $op = $cgi->param('op') || 'edit';
 my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef;
+my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');
 my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
+
 my $branch_code = get_branch_code_from_name($template->param('LoginBranchname'));
 
 if ($op eq 'remove') {
@@ -81,16 +78,28 @@ elsif ($op eq 'delete') {
 elsif ($op eq 'add') {
     $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
     $batch = C4::Labels::Batch->new(branch_code => $branch_code) if $batch == -2;
-    foreach my $item_number (@item_numbers) {
-        $err = $batch->add_item($item_number);
+    if ($branch_code){
+        foreach my $item_number (@item_numbers) {
+            $err = $batch->add_item($item_number);
+        }
+        $errstr = "item(s) not added to batch $batch_id." if $err;
+    }
+    else {
+        $err = 1;
+        $errstr = "items(s) not added, the error was: Branch is not set, you please set your branch before adding items to a batch";
     }
-    $errstr = "item(s) not added to batch $batch_id." if $err;
 }
 elsif ($op eq 'new') {
     $batch = C4::Labels::Batch->new(branch_code => $branch_code);
     $batch_id = $batch->get_attr('batch_id');
 }
-else { # display batch
+elsif ($op eq 'de_duplicate') {
+    $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
+    $duplicate_count = $batch->remove_duplicates();
+    $duplicate_message = 1 if $duplicate_count != -1;
+    $errstr = "batch $batch_id not fully de-duplicated." if $duplicate_count == -1;
+}
+else { # edit
     $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
 }
 
@@ -99,13 +108,17 @@ $db_rows = get_label_summary(items => $items, batch_id => $batch_id);
 
 my $table = html_table($display_columns, $db_rows);
 
-$template->param(   err         => $err,
-                    errstr      => $errstr,
+$template->param(   
+                err         => $err,
+                errstr      => $errstr,
                 ) if ($err ne 0);
+
 $template->param(
-                op              => $op,
-                batch_id        => $batch_id,
-                table_loop      => $table,
-);
+                op                      => $op,
+                batch_id                => $batch_id,
+                table_loop              => $table,
+                duplicate_message       => $duplicate_message,
+                duplicate_count         => $duplicate_count,
+                );
 
 output_html_with_http_headers $cgi, $cookie, $template->output;