X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-item-search.pl;h=9b920094cf1a92c030608aff44b1b11b249fb88b;hb=43214bbcce4a2d67cc9e299ec26690028cab3854;hp=c95bdf0fb96b97efc77785fec82fd77ea9b83e6b;hpb=aa16f1229c3978575324889c1c056b2851d75b41;p=koha_fer diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl index c95bdf0fb9..9b920094cf 100755 --- a/labels/label-item-search.pl +++ b/labels/label-item-search.pl @@ -13,18 +13,16 @@ # 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 Sys::Syslog qw(syslog); use POSIX qw(ceil); use C4::Auth qw(get_template_and_user); @@ -35,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 { @@ -94,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"; @@ -128,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'); @@ -140,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); } }