From 192dd7bb2e99b229f422a819f8e15732ac99393d Mon Sep 17 00:00:00 2001
From: Joe Atzberger <joe.atzberger@liblime.com>
Date: Thu, 3 Jan 2008 14:46:20 -0600
Subject: [PATCH] Labels overhaul - labels were largely broken (and still are
 somewhat), but this overhaul addresses Add, Delete, deduplication, messages
 to user, debug, etc.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/labels/label-manager.tmpl |  58 ++++----
 .../prog/en/modules/labels/result.tmpl        |  14 +-
 .../prog/en/modules/labels/search.tmpl        |  13 +-
 labels/label-item-search.pl                   | 138 ++++++++----------
 labels/label-manager.pl                       |  39 ++++-
 5 files changed, 128 insertions(+), 134 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index e4d751ac50..6c3fa67c7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -11,16 +11,19 @@ function Plugin(batch_id) {
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
+ <div id="doc3" class="yui-t2">
+  <div id="bd">
+   <div id="yui-main">
 	<div class="yui-b">
 
+<!-- TMPL_IF NAME="message" -->
+	<!-- TMPL_LOOP NAME="message_loop" -->
+	<div style="color: red; margin: 5pt; font-weight: bold;" class="message"><!-- TMPL_VAR NAME="message_text" --></div>
+	<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
 <!-- TMPL_UNLESS NAME="batch_id" -->
 <!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
-
 <!-- TMPL_IF NAME="batches" -->
 <div class="yui-g">
 
@@ -28,7 +31,7 @@ function Plugin(batch_id) {
 <h2>Label Batches</h2>
 <table>
 <tr>
-        <th>Batch id</th>
+        <th>ID</th>
         <th>#</th>
         <th>Edit</th>
         <th>Delete</th>
@@ -36,19 +39,16 @@ function Plugin(batch_id) {
 </tr>
 <!-- TMPL_LOOP NAME="batches" -->
 <tr>
-        <td>
-                <!-- TMPL_VAR NAME="batch_id" -->
-        </td>
-        <td>
-                <!-- TMPL_VAR NAME="num" --> records
-        </td>
+        <td><!-- TMPL_VAR NAME="batch_id" --></td>
+        <td><!-- TMPL_VAR NAME="num" --> records</td>
         <td>
                 <a href="/cgi-bin/koha/labels/label-manager.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Edit</a>
         </td>
         <td>
                 <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+				<!-- FIXME: should use POST to change server state, not GET -->
         </td>
-          <td>
+        <td>
 		  <a style="float: left;"  href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch  <!-- TMPL_VAR NAME="batch_id" --></a>
         </td></tr>
 <!-- /TMPL_LOOP -->
@@ -60,7 +60,7 @@ function Plugin(batch_id) {
 </div>
 <!-- TMPL_ELSE -->
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /batches -->
 
 <!-- TMPL_ELSE -->
 
@@ -86,6 +86,7 @@ function Plugin(batch_id) {
 											onclick: {fn:function(){Plugin(<!-- TMPL_VAR NAME="batch_id" -->)}}
                                         });
 		new YAHOO.widget.Button("deletebatch");
+		new YAHOO.widget.Button("dedup");
 		new YAHOO.widget.Button("generate");
 	}
 
@@ -94,6 +95,8 @@ function Plugin(batch_id) {
 	<ul class="toolbar">
 	<li id="additemsc"><a id="additems" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->); return false;">Add item(s) to batch</a></li>
 	<li><a id="deletebatch" href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete current batch</a></li>
+				<!-- FIXME: should use POST to change server state, not GET -->
+	<li><a id="dedup" href="/cgi-bin/koha/labels/label-manager.pl?op=deduplicate&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Remove duplicate barcodes</a></li>
 	<li><a id="generate" href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch</a></li>
 </ul></div>
 
@@ -101,31 +104,28 @@ function Plugin(batch_id) {
 
 <table>
 <tr>
-        <th>Label Number</th>
+        <th>Label<br />Num.</th>
         <th>Summary</th>
-        <th>Item Type</th>
+        <th>Item<br />Type</th>
         <th>Barcode</th>
         <th>Delete</th>
 </tr>
 <!-- TMPL_LOOP NAME="resultsloop" -->
 <tr>
+        <td><!-- TMPL_VAR NAME="labelno" --></td>
+        <td><b><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"> <!-- TMPL_VAR NAME="title" --></a></b>:
+			<!-- TMPL_VAR NAME="author" -->:
+            <!-- TMPL_VAR NAME="isbn" --></td>
+        <td><!-- TMPL_VAR NAME="itemtype" --></td>
+        <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
-                <!-- TMPL_VAR NAME="labelno" -->
-        </td>
-        <td>
-                <b> <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"> <!-- TMPL_VAR NAME="title" -->:</a></b> <!-- TMPL_VAR NAME="author" -->:
-                <!-- TMPL_VAR NAME="isbn" -->         </td>
-        <td>           <!-- TMPL_VAR NAME="itemtype" -->         </td>
-        <td>          <!-- TMPL_VAR NAME="barcode" -->         </td>
-        <td>
-                <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+                <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete&amp;labelid=<!-- TMPL_VAR NAME="labelid" -->&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+				<!-- FIXME: should use POST to change server state, not GET -->
         </td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-
-
-<!-- /TMPL_UNLESS -->
+<!-- /TMPL_UNLESS --><!-- batch_id -->
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
index 0b48655b5e..1cec888eee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -2,7 +2,6 @@
 <script type="text/javascript">
 <!--
 
-
 function add_item(itemnum,batch_id){
 
  var getstr='';
@@ -66,12 +65,12 @@ function add_item3(itemnumber){
 			<!-- TMPL_IF name=total -->
 			&nbsp;<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
 			<!-- TMPL_ELSE -->
-			&nbsp; No results found<br>
+			&nbsp; No results found<br />
 			<!-- /TMPL_IF -->
 		</p>
 	</div>
 <form name='resultform'>
-	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="button" href="#" onclick="window.close()">[ Done ]</a></span>
+	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="icon addchecked" href="#" onclick="window.close()">[ Done ]</a></span>
 <input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" />
 	<table>
 	<tr>
@@ -82,7 +81,7 @@ function add_item3(itemnumber){
 		<th>Add</th>
 	</tr>
 	<!-- TMPL_LOOP name="result" -->
-		<!-- TMPL_IF name="even" -->
+		<!-- TMPL_IF name="highlight" -->
 			<tr class="highlight">
 		<!-- TMPL_ELSE -->
 			<tr>
@@ -103,14 +102,9 @@ function add_item3(itemnumber){
 					<!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><br /> <!-- /TMPL_IF -->
 					<!-- TMPL_IF name="dateaccessioned" -->[<!-- TMPL_VAR name="dateaccessioned" -->]<br /> <!-- /TMPL_IF -->
 					<!-- TMPL_IF name="barcode" --> <!-- TMPL_VAR name="barcode" --> <!-- /TMPL_IF -->
-
 				</td>
 				<td>
-					<a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->,<!-- TMPL_VAR NAME="batch_id" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR name="batch_id" -->&amp;op=add">Add</a>
-
-
-
-
+					<a onclick="add_item('<!-- TMPL_VAR NAME="itemnumber" -->',<!-- TMPL_VAR NAME="batch_id" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR name="batch_id" -->&amp;op=add">Add</a>
 
 <!-- /NEW -->
 				</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index ce9100205d..eec992df8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -3,13 +3,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <style type="text/css">#custom-doc { width:47.23em;*width:46.04em;min-width:610px; margin:auto;margin-top: .4em; text-align:left; }</style>
 </head>
-<body>
+<body onload="document.getElementById('marclist').select();">
 
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
 
 <h1>Catalog item search
-
 <!-- TMPL_IF name="batch_id" -->
  for batch <!-- TMPL_VAR NAME="batch_id" -->
 <!-- /TMPL_IF  -->
@@ -20,7 +19,7 @@
 	<input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
 	<fieldset class="rows">
 <ol><li>
-  <select name="idx">
+  <select name="idx" disabled><!-- FIXME: script does keyword search regardless -->
     <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
     <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
@@ -35,9 +34,9 @@
     <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
     <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
 </select>
-   <input type="text" size="30" name="marclist" title="Enter search terms" value=""/>  
+   <input type="text" size="30" id="marclist" name="marclist" title="Enter search terms" value=""/>  
 </li><li>
-<select name="idx">
+<select name="idx" disabled><!-- FIXME: script does keyword search regardless -->
     <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
     <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
@@ -52,7 +51,7 @@
     <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
     <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
 </select>
-   <input type="text" size="30" name="q" title="Enter search terms" value="" />
+   <input type="text" size="30" name="q" title="Enter search terms" value="" disabled/><!-- FIXME: script doesn't "catch" q param -->
 </li>
 </ol>
 </fieldset>
@@ -118,7 +117,7 @@
 -->
     <tr><th scope="row">Document Type</th>
                 <td colspan="2">
-                    <select name="Filter">
+                    <select name="Filter" disabled><!-- FIXME: script returns ALL type regardless-->
                         <option value="">All Item Types</option>
                         <!-- TMPL_LOOP name="itemtypeloop" -->
                             <!-- TMPL_IF name="selected" -->
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 4abc480dbc..65a6859855 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -19,7 +19,6 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
 use CGI;
 use C4::Auth;
 use HTML::Template::Pro;
@@ -47,69 +46,59 @@ my $op              = $query->param('op');
 my $batch_id        = $query->param('batch_id');
 my $dateaccessioned = $query->param('dateaccessioned');
 
-### $query;
-
 my $dbh = C4::Context->dbh;
 
-my $startfrom = $query->param('startfrom');
-$startfrom = 0 if ( !defined $startfrom );
+my $startfrom = $query->param('startfrom') || 0;
 my ( $template, $loggedinuser, $cookie );
-my $resultsperpage;
+my (@marclist,@and_or,@excluding,@operator,@value,$orderby,@tags,$results,$total,$error,$marcresults);
+my $resultsperpage = $query->param('resultsperpage') || 19;
 
+my $show_results = 0;
 if ( $op eq "do_search" ) {
-    my @marclist  = $query->param('marclist');
-    my @and_or    = $query->param('and_or');
-    my @excluding = $query->param('excluding');
-    my @operator  = $query->param('operator');
-    my @value     = $query->param('value');
-
-    $resultsperpage = $query->param('resultsperpage');
-    $resultsperpage = 19 if ( !defined $resultsperpage );
-    my $orderby = $query->param('orderby');
-
-    # builds tag and subfield arrays
-    my @tags;
-
-    my ( $results, $total ) ;
+    @marclist  = $query->param('marclist');
+    @and_or    = $query->param('and_or');
+    @excluding = $query->param('excluding');
+    @operator  = $query->param('operator');
+    @value     = $query->param('value');
+    $orderby   = $query->param('orderby');
+	if (scalar @marclist) {
       #catalogsearch( $dbh, \@tags, \@and_or, \@excluding, \@operator, \@value,
       #  $startfrom * $resultsperpage,
       #  $resultsperpage, $orderby );
+		($error, $marcresults) = SimpleSearch($marclist[0]);
+		if ($marcresults) {
+			$show_results = scalar @$marcresults;
+		} else {
+			warn "ERROR label-item-search: no results from SimpleSearch";
+			# leave $show_results undef
+		}
+	}
+}
 
-#use Data::Dumper;
-	my $searchquery=$marclist[0];
-	my ($error, $marcresults) = SimpleSearch($searchquery);
-	my $hits = scalar @$marcresults;
-	my @results;
-
-	for(my $i=0;$i<$hits;$i++) {
-		my %resultsloop;
+if ( $show_results ) {
+	my $hits = $show_results;
+	my (@results,@results2);
+	for(my $i=0; $i<$hits; $i++) {
 		my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
 		my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
 		#build the hash for the template.
-		%resultsloop=%$biblio;
-		$resultsloop{highlight}       = ($i % 2)?(1):(0);
-		#warn $resultsloop{biblionumber};
-		push @results, \%resultsloop;
-	}
-    my @results2;
-    my $i;
-    for ( $i = 0 ; $i <= ( $hits - 1 ) ; $i++ ) {
-        my $itemnums = get_itemnumbers_of($results[$i]->{'biblionumber'});
-
-        my $iii = $itemnums->{$results[$i]->{'biblionumber'} } ;
-        my $item_results;
-		if ($iii ) {
-			$item_results =  &GetItemInfosOf( @$iii );
-        }
-        foreach my $item (keys %$item_results) {
-			for my $bibdata (keys %{$results[$i]}) {
-#warn Dumper($bibdata);        
-#warn Dumper($results[$i]->{$bibdata});
-				$item_results->{$item}{$bibdata} = $results[$i]->{$bibdata} unless exists $item_results->{$item}{$bibdata};
+		$biblio->{highlight}       = ($i % 2)?(1):(0);
+		#warn $biblio->{biblionumber};
+		push @results, $biblio;
+		my $biblionumber = $biblio->{'biblionumber'};
+        my $itemnums = get_itemnumbers_of($biblionumber);
+        my $iii = $itemnums->{$biblionumber} ;
+		if ($iii) {
+			my $item_results =  &GetItemInfosOf( @$iii );
+        	foreach my $item (keys %$item_results) {
+				for my $bibdata (keys %{$results[$i]}) {
+					#warn Dumper($bibdata);        
+					#warn Dumper($results[$i]->{$bibdata});
+					$item_results->{$item}{$bibdata} = $results[$i]->{$bibdata};
+				}
+            	push @results2, $item_results->{$item};
 			}
-            push @results2, $item_results->{$item};
-        }
-
+		}
     }
    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
@@ -132,6 +121,8 @@ if ( $op eq "do_search" ) {
 
     my @field_data = ();
 
+	# FIXME: this relies on symmetric order of CGI params that IS NOT GUARANTEED by spec.
+
     for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
         push @field_data, { term => "marclist",  val => $marclist[$i] };
         push @field_data, { term => "and_or",    val => $and_or[$i] };
@@ -141,7 +132,6 @@ if ( $op eq "do_search" ) {
     }
 
     my @numbers = ();
-
     if ( $total > $resultsperpage ) {
         for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
             if ( $i < 16 ) {
@@ -159,14 +149,8 @@ if ( $op eq "do_search" ) {
     }
 
     my $from = $startfrom * $resultsperpage + 1;
-    my $to;
-
-    if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
-        $to = $total;
-    }
-    else {
-        $to = ( ( $startfrom + 1 ) * $resultsperpage );
-    }
+	my $temp = ( $startfrom + 1 ) * $resultsperpage;
+    my $to   = ($total < $temp) ? $total : $temp;
 
     # this gets the results of the search (which are bibs)
     # and then does a lookup on all items that exist for that bib
@@ -174,21 +158,20 @@ if ( $op eq "do_search" ) {
     # items attached to the bibs not thew bibs themselves
 
    # my @results2;
-    for (my $i = 0 ; $i <= ( $total - 1 ) ; $i++ )
-    {    #total-1 coz the array starts at 0
-            #warn $i;
-            #warn Dumper $results->[$i]{'bibid'};
-        my $type = 'intra';
-        my @item_results =
-          &ItemInfo( 0, $results->[$i]{'biblionumber'}, $type );
-
-        foreach my $item (@item_results) {
-            #warn Dumper $item;
-            push @results2, $item;
-        }
-
-    }
-
+    # for (my $i = 0 ; $i < $total ; $i++ )
+    # {
+        #warn $i;
+        #warn Dumper $results->[$i]{'bibid'};
+    #     my $type = 'intra';
+    #     my @item_results = &ItemInfo( 0, $results->[$i]{'biblionumber'}, $type );
+			# FIXME: ItemInfo doesn't exist !!
+# 		push @results2,\@item_results;
+        # foreach my $item (@item_results) {
+        #	warn Dumper $item;
+        #	push @results2, $item;
+        # }
+#     }
+# 
     $template->param(
         result         => \@results2,
         startfrom      => $startfrom,
@@ -206,11 +189,9 @@ if ( $op eq "do_search" ) {
     );
 }
 
-#
 #
 #   search section
 #
-#
 
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -224,7 +205,6 @@ else {
         }
     );
 
-
    #using old rel2.2 getitemtypes for testing!!!!, not devweek's GetItemTypes()
 
     my $itemtypes = GetItemTypes;
@@ -236,8 +216,6 @@ else {
                             );  
             push @itemtypeloop, \%row;
     }  
-
-
     $template->param(
     itemtypeloop =>\@itemtypeloop,
         batch_id     => $batch_id,
diff --git a/labels/label-manager.pl b/labels/label-manager.pl
index 712aac1f2d..ad3ae816f0 100755
--- a/labels/label-manager.pl
+++ b/labels/label-manager.pl
@@ -10,8 +10,15 @@ use HTML::Template::Pro;
 #use Data::Dumper;
 #use Smart::Comments;
 
+use vars qw($debug);
+
+BEGIN { 
+	$debug = $ENV{DEBUG} || 0;
+}
+
 my $dbh            = C4::Context->dbh;
 my $query          = new CGI;
+$query->param('debug') and $debug = $query->param('debug');
 my $op             = $query->param('op');
 my $layout_id      = $query->param('layout_id');
 my $layoutname     = $query->param('layoutname');
@@ -49,6 +56,7 @@ my $active_template_name = $active_template->{'tmpl_code'};
 #    $batch_id  = get_highest_batch();
 #}
 
+my @messages;
 my ($itemnumber) = @itemnumber if (scalar(@itemnumber) == 1);
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -111,9 +119,14 @@ elsif ( $op eq 'deleteall' ) {
 	$sth2->finish;
 }
 elsif ( $op eq 'delete' ) {
-	my $query2 = "DELETE FROM labels where itemnumber = ?";
+	my @labelids = $query->param('labelid');
+	scalar @labelids or push @messages, "ERROR: No labelid(s) supplied for deletion.";
+	my $ins = "?," x (scalar @labelids);
+	$ins =~ s/\,$//;
+	my $query2 = "DELETE FROM labels WHERE labelid IN ($ins) ";
+	$debug and push @messages, "query2: $query2 -- (@labelids)";
 	my $sth2   = $dbh->prepare($query2);
-	$sth2->execute($itemnumber);
+	$sth2->execute(@labelids);
 	$sth2->finish;
 }
 elsif ( $op eq 'delete_batch' ) {
@@ -129,18 +142,19 @@ elsif ( $op eq 'set_active_layout' ) {
 	print $query->redirect("label-home.pl");
 	exit;
 }
+elsif ( $op eq 'deduplicate' ) {
+	my $return = deduplicate_batch($batch_id);
+	my $msg = (($return) ? "Removed $return" : "Error revoving") . " duplicate items from Batch $batch_id";
+	push @messages, $msg;
+}
 
 #  first lets do a read of the labels table , to get the a list of the
 # currently entered items to be prinited
-#use Data::Dumper;
 my @batches = get_batches();
 my @resultsloop = get_label_items($batch_id);
-#warn $batches[0];
-#warn $batch_id;
+#warn "$batches[0] (id $batch_id)";
 #warn Dumper(@resultsloop);
 
-my $tmpl =GetActiveLabelTemplate();
-
 #calc-ing number of sheets
 #my $number_of_results = scalar @resultsloop;
 #my $sheets_needed = ceil( ( --$number_of_results + $startrow ) / 8 ); # rounding up
@@ -148,6 +162,15 @@ my $tmpl =GetActiveLabelTemplate();
 #my $start_results    = ( $number_of_results + $startrow );
 #my $labels_remaining = ( $tot_labels - $start_results );
 
+if (scalar @messages) {
+	$template->param(message => 1);
+	my @complex = ();
+	foreach (@messages) {
+		my %hash = (message_text => $_);
+		push @complex, \%hash;
+	}
+	$template->param(message_loop => \@complex);
+}
 $template->param(
     batch_id => $batch_id,
 	batch_count => scalar @resultsloop,
@@ -156,7 +179,7 @@ $template->param(
 
     resultsloop => \@resultsloop,
     batches => \@batches,
-	tmpl_desc => $tmpl->{'tmpl_desc'},
+	tmpl_desc => $active_template->{'tmpl_desc'},
 
     #  startrow         => $startrow,
     #  sheets           => $sheets_needed,
-- 
2.20.1