1f0ff90360
The previous patch wants to select the barcode option when the user is on the item search for label, in all cases. So even if 'title' is selected, a search done, and there is no result, the barcode index is selected anyway. In this case, the title option should be kept. Test plan: Confirm that the barcode option is the default choice, but other values are kept if the search does not return any result. Followed test plan, behaves as expected. Tested with all choices. Signed-off-by: Marc Veron <veron@veron.ch> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
267 lines
9.2 KiB
Perl
Executable file
267 lines
9.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
#
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY 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, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use vars qw($debug $cgi_debug);
|
|
|
|
use CGI qw ( -utf8 );
|
|
use List::Util qw( max min );
|
|
use POSIX qw(ceil);
|
|
|
|
use C4::Auth qw(get_template_and_user);
|
|
use C4::Output qw(output_html_with_http_headers);
|
|
use C4::Context;
|
|
use C4::Dates;
|
|
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::Creators::Lib qw(html_table);
|
|
use C4::Debug;
|
|
|
|
BEGIN {
|
|
$debug = $debug || $cgi_debug;
|
|
if ($debug) {
|
|
require Data::Dumper;
|
|
import Data::Dumper qw(Dumper);
|
|
}
|
|
}
|
|
|
|
my $query = new CGI;
|
|
|
|
my $type = $query->param('type');
|
|
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;
|
|
my ($template, $loggedinuser, $cookie) = (undef, undef, undef);
|
|
my (
|
|
$total_hits, $orderby, $results, $total, $error,
|
|
$marcresults, $idx, $datefrom, $dateto, $ccl_textbox
|
|
);
|
|
my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
|
|
my $show_results = 0;
|
|
my $display_columns = [ {_add => {label => "Add Item", link_field => 1}},
|
|
{_item_call_number => {label => "Call Number", link_field => 0}},
|
|
{_date_accessioned => {label => "Accession Date", link_field => 0}},
|
|
{_barcode => {label => "Barcode", link_field => 0}},
|
|
{select => {label => "Select", value => "_item_number"}},
|
|
];
|
|
|
|
if ( $op eq "do_search" ) {
|
|
my $QParser;
|
|
$QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
|
|
$idx = $query->param('idx');
|
|
$ccl_textbox = $query->param('ccl_textbox');
|
|
if ( $ccl_textbox && $idx ) {
|
|
$ccl_query = "$idx:$ccl_textbox";
|
|
}
|
|
|
|
$datefrom = $query->param('datefrom');
|
|
$dateto = $query->param('dateto');
|
|
|
|
if ($datefrom) {
|
|
$datefrom = C4::Dates->new($datefrom);
|
|
if ($QParser) {
|
|
$ccl_query .= ' && ' if $ccl_textbox;
|
|
$ccl_query .=
|
|
"acqdate(" . $datefrom->output("iso") . '-)';
|
|
} else {
|
|
$ccl_query .= ' and ' if $ccl_textbox;
|
|
$ccl_query .=
|
|
"acqdate,st-date-normalized,ge=" . $datefrom->output("iso");
|
|
}
|
|
}
|
|
|
|
if ($dateto) {
|
|
$dateto = C4::Dates->new($dateto);
|
|
if ($QParser) {
|
|
$ccl_query .= ' && ' if ( $ccl_textbox || $datefrom );
|
|
$ccl_query .= "acqdate(-" . $dateto->output("iso") . ')';
|
|
} else {
|
|
$ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
|
|
$ccl_query .= "acqdate,st-date-normalized,le=" . $dateto->output("iso");
|
|
}
|
|
}
|
|
|
|
my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
|
|
( $error, $marcresults, $total_hits ) =
|
|
SimpleSearch( $ccl_query, $offset, $resultsperpage );
|
|
|
|
if (!defined $error && @{$marcresults} ) {
|
|
$show_results = @{$marcresults};
|
|
}
|
|
else {
|
|
$debug and warn "ERROR label-item-search: no results from SimpleSearch";
|
|
|
|
# leave $show_results undef
|
|
}
|
|
}
|
|
|
|
if ($show_results) {
|
|
my $hits = $show_results;
|
|
my @results_set = ();
|
|
my @items =();
|
|
# This code needs to be refactored using these subs...
|
|
#my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
|
|
#my $dat = &GetBiblioData( $biblio->{biblionumber} );
|
|
for ( my $i = 0 ; $i < $hits ; $i++ ) {
|
|
my @row_data= ();
|
|
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
|
|
my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $marcresults->[$i] );
|
|
#DEBUG Notes: Transform it to Koha form...
|
|
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
|
|
#DEBUG Notes: Stuff the bib into @biblio_data...
|
|
push (@results_set, $biblio);
|
|
my $biblionumber = $biblio->{'biblionumber'};
|
|
#DEBUG Notes: Grab the item numbers associated with this MARC record...
|
|
my $itemnums = get_itemnumbers_of($biblionumber);
|
|
#DEBUG Notes: Retrieve the item data for each number...
|
|
if (my $iii = $itemnums->{$biblionumber}) {
|
|
my $item_results = GetItemInfosOf(@$iii);
|
|
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_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');
|
|
$item_data->{'_add'} = $item_results->{$item}->{'itemnumber'};
|
|
unshift (@row_data, $item_data); # item numbers are given to us in descending order by get_itemnumbers_of()...
|
|
}
|
|
}
|
|
$results_set[$i]->{'item_table'} = html_table($display_columns, \@row_data);
|
|
}
|
|
else {
|
|
# FIXME: Some error trapping code needed
|
|
warn sprintf('No item numbers retrieved for biblio number: %s', $biblionumber);
|
|
}
|
|
}
|
|
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "labels/result.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrowers => 1 },
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# build page nav stuff.
|
|
my ( @field_data, @numbers );
|
|
$total = $total_hits;
|
|
|
|
my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
|
|
$displayprev );
|
|
|
|
if ( $total > $resultsperpage ) {
|
|
my $num_of_pages = ceil( $total / $resultsperpage + 1 );
|
|
for ( my $page = 1 ; $page < $num_of_pages ; $page++ ) {
|
|
my $startfrm = ( ( $page - 1 ) * $resultsperpage ) + 1;
|
|
push @numbers,
|
|
{
|
|
number => $page,
|
|
startfrom => $startfrm
|
|
};
|
|
}
|
|
|
|
$from = $startfrom;
|
|
$startfromprev = $startfrom - $resultsperpage;
|
|
$startfromnext = $startfrom + $resultsperpage;
|
|
|
|
$to =
|
|
$startfrom + $resultsperpage > $total
|
|
? $total
|
|
: $startfrom + $resultsperpage - 1;
|
|
|
|
# multi page display
|
|
$displaynext = 0;
|
|
$displayprev = $startfrom > 1 ? $startfrom : 0;
|
|
|
|
$displaynext = 1 if $to < $total_hits;
|
|
|
|
}
|
|
else {
|
|
$displayprev = 0;
|
|
$displaynext = 0;
|
|
}
|
|
|
|
$template->param(
|
|
total => $total_hits,
|
|
from => $from,
|
|
to => $to,
|
|
startfromnext => $startfromnext,
|
|
startfromprev => $startfromprev,
|
|
startfrom => $startfrom,
|
|
displaynext => $displaynext,
|
|
displayprev => $displayprev,
|
|
resultsperpage => $resultsperpage,
|
|
numbers => \@numbers,
|
|
);
|
|
|
|
$template->param(
|
|
results => ($show_results ? 1 : 0),
|
|
result_set=> \@results_set,
|
|
batch_id => $batch_id,
|
|
type => $type,
|
|
ccl_query => $ccl_query,
|
|
);
|
|
}
|
|
|
|
#
|
|
# search section
|
|
#
|
|
|
|
else {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "labels/search.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
my $itemtypes = GetItemTypes;
|
|
my @itemtypeloop;
|
|
foreach my $thisitemtype ( keys %$itemtypes ) {
|
|
my %row = (
|
|
value => $thisitemtype,
|
|
description => $itemtypes->{$thisitemtype}->{'description'},
|
|
);
|
|
push @itemtypeloop, \%row;
|
|
}
|
|
$template->param(
|
|
itemtypeloop => \@itemtypeloop,
|
|
batch_id => $batch_id,
|
|
type => $type,
|
|
);
|
|
|
|
}
|
|
|
|
$template->param( idx => $idx );
|
|
|
|
# Print the page
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|