Merge remote-tracking branch 'origin/new/bug_7143'

[koha.git] / labels / label-item-search.pl

diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 433ed14..9b92009 100755 (executable)
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -13,18 +13,17 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
 use vars qw($debug $cgi_debug);
 
 use CGI;
-use HTML::Template::Pro;
 use List::Util qw( max min );
-use POSIX;
+use POSIX qw(ceil);
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
@@ -34,7 +33,7 @@ use C4::Search qw(SimpleSearch);
 use C4::Biblio qw(TransformMarcToKoha);
 use C4::Items qw(GetItemInfosOf get_itemnumbers_of);
 use C4::Koha qw(GetItemTypes);    # XXX subfield_is_koha_internal_p
-use C4::Labels::Lib qw(html_table);
+use C4::Creators::Lib qw(html_table);
 use C4::Debug;
 
 BEGIN {
@@ -48,7 +47,7 @@ BEGIN {
 my $query = new CGI;
 
 my $type      = $query->param('type');
-my $op        = $query->param('op');
+my $op        = $query->param('op') || '';
 my $batch_id  = $query->param('batch_id');
 my $ccl_query = $query->param('ccl_query');
 my $startfrom = $query->param('startfrom') || 1;
@@ -93,8 +92,8 @@ if ( $op eq "do_search" ) {
     ( $error, $marcresults, $total_hits ) =
       SimpleSearch( $ccl_query, $offset, $resultsperpage );
 
-    if (scalar($marcresults) > 0) {
-        $show_results = scalar @$marcresults;
+    if (!defined $error && @{$marcresults} ) {
+        $show_results = @{$marcresults};
     }
     else {
         $debug and warn "ERROR label-item-search: no results from SimpleSearch";
@@ -127,7 +126,8 @@ if ($show_results) {
             foreach my $item ( keys %$item_results ) {
                 #DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
                 if ($item_results->{$item}->{'biblionumber'} eq $results_set[$i]->{'biblionumber'}) {
-                    my $item_data->{'_item_number'} = $item_results->{$item}->{'itemnumber'};
+                    my $item_data;
+                    $item_data->{'_item_number'} = $item_results->{$item}->{'itemnumber'};
                     $item_data->{'_item_call_number'} = ($item_results->{$item}->{'itemcallnumber'} ? $item_results->{$item}->{'itemcallnumber'} : 'NA');
                     $item_data->{'_date_accessioned'} = $item_results->{$item}->{'dateaccessioned'};
                     $item_data->{'_barcode'} = ( $item_results->{$item}->{'barcode'} ? $item_results->{$item}->{'barcode'} : 'NA');
@@ -139,7 +139,7 @@ if ($show_results) {
         }
         else {
             # FIXME: Some error trapping code needed
-            syslog("LOG_ERR", "labels/label-item-search.pl : No item numbers retrieved for biblio number: %s", $biblionumber);
+            warn sprintf('No item numbers retrieved for biblio number: %s', $biblionumber);
         }
     }