# 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 Modern::Perl;
use CGI qw ( -utf8 );
-use List::Util qw( max min );
-use POSIX qw(ceil);
+use POSIX qw( ceil );
-use C4::Auth qw(get_template_and_user);
-use C4::Output qw(output_html_with_http_headers);
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
use C4::Context;
-use C4::Search qw(SimpleSearch);
-use C4::Biblio qw(TransformMarcToKoha);
-use C4::Items qw(GetItemInfosOf get_itemnumbers_of);
-use C4::Creators::Lib qw(html_table);
-use C4::Debug;
-use Koha::DateUtils;
+use C4::Search qw( new_record_from_zebra );
+use C4::Biblio qw( TransformMarcToKoha );
+use C4::Creators::Lib qw( html_table );
+use Koha::Logger;
+use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::Items;
use Koha::ItemTypes;
use Koha::SearchEngine::Search;
-BEGIN {
- $debug = $debug || $cgi_debug;
- if ($debug) {
- require Data::Dumper;
- import Data::Dumper qw(Dumper);
- }
-}
-
-my $query = new CGI;
+my $query = CGI->new;
my $type = $query->param('type');
my $op = $query->param('op') || '';
];
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 ) {
$datefrom = eval { dt_from_string ( $datefrom ) };
if ($datefrom) {
$datefrom = output_pref( { dt => $datefrom, dateonly => 1, dateformat => 'iso' } );
- if ($QParser) {
- $ccl_query .= ' && ' if $ccl_textbox;
- $ccl_query .=
- "acqdate(" . $datefrom . '-)';
- } else {
- $ccl_query .= ' and ' if $ccl_textbox;
- $ccl_query .= "acqdate,st-date-normalized,ge=" . $datefrom;
- }
+ $ccl_query .= ' and ' if $ccl_textbox;
+ $ccl_query .= "acqdate,ge,st-date-normalized=" . $datefrom;
}
}
$dateto = eval { dt_from_string ( $dateto ) };
if ($dateto) {
$dateto = output_pref( { dt => $dateto, dateonly => 1, dateformat => 'iso' } );
- if ($QParser) {
- $ccl_query .= ' && ' if ( $ccl_textbox || $datefrom );
- $ccl_query .= "acqdate(-" . $dateto . ')';
- } else {
- $ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
- $ccl_query .= "acqdate,st-date-normalized,le=" . $dateto;
- }
+ $ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
+ $ccl_query .= "acqdate,le,st-date-normalized=" . $dateto;
}
}
$show_results = @{$marcresults};
}
else {
- $debug and warn "ERROR label-item-search: no results from simple_search_compat";
+ Koha::Logger->get->warn("ERROR label-item-search: no results from simple_search_compat");
# leave $show_results undef
}
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...
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);
+ my $items = Koha::Items->search({ biblionumber => $biblionumber }, { order_by => { -desc => 'itemnumber' }});
#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()...
- }
+ while ( my $item = $items->next ) {
+ #DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
+ if ( $item->biblionumber eq $results_set[$i]->{'biblionumber'} ) {
+ my $item_data;
+ $item_data->{'_item_number'} = $item->itemnumber;
+ $item_data->{'_item_call_number'} = ( $item->itemcallnumber || 'NA' );
+ $item_data->{'_date_accessioned'} = $item->dateaccessioned;
+ $item_data->{'_barcode'} = ( $item->barcode || 'NA' );
+ $item_data->{'_add'} = $item->itemnumber;
+ push @row_data, $item_data;
}
$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 => { borrowers => 'edit_borrowers' },
flagsrequired => { catalogue => 1 },
- debug => 1,
}
);
}
else {
+ $from = 1;
+ $to = $total_hits;
$displayprev = 0;
$displaynext = 0;
}
template_name => "labels/search.tt",
query => $query,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { catalogue => 1 },
- debug => 1,
}
);
my $itemtypes = Koha::ItemTypes->search;
projects / srvgit / blobdiff