#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
+#
# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, 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, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+use vars qw($debug $cgi_debug);
+
+use CGI qw ( -utf8 );
+use List::Util qw( max min );
+use POSIX qw(ceil);
-use strict;
-use CGI;
-use C4::Auth;
-use HTML::Template::Pro;
+use C4::Auth qw(get_template_and_user);
+use C4::Output qw(output_html_with_http_headers);
use C4::Context;
-use C4::Search;
-use C4::Auth;
-use C4::Output;
-use C4::Biblio;
-use C4::Items;
-use C4::Acquisition;
-use C4::Search;
-use C4::Dates;
-use C4::Koha; # XXX subfield_is_koha_internal_p
+use C4::Search qw(SimpleSearch);
+use C4::Biblio qw(TransformMarcToKoha);
+use C4::Creators::Lib qw(html_table);
use C4::Debug;
-use List::Util qw( max min );
-use POSIX;
-#use Smart::Comments;
-#use Data::Dumper;
+use Koha::DateUtils;
+use Koha::Items;
+use Koha::ItemTypes;
+use Koha::SearchEngine::Search;
BEGIN {
$debug = $debug || $cgi_debug;
}
}
-# Creates a scrolling list with the associated default value.
-# Using more than one scrolling list in a CGI assigns the same default value to all the
-# scrolling lists on the page !?!? That's why this function was written.
-
-my $query = new CGI;
+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 $dbh = C4::Context->dbh;
-
my $startfrom = $query->param('startfrom') || 1;
-my ( $template, $loggedinuser, $cookie );
-my ($total_hits, $orderby, $results, $total, $error, $marcresults, $idx, $datefrom, $dateto, $ccl_textbox);
-
+my ($template, $loggedinuser, $cookie) = (undef, undef, undef);
+my (
+ $total_hits, $total, $error,
+ $marcresults, $idx, $datefrom, $dateto, $ccl_textbox
+);
my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
-
my $show_results = 0;
-
-if ($op eq "do_search") {
- $idx = $query->param('idx');
- $ccl_textbox = $query->param('ccl_textbox');
- if ($ccl_textbox && $idx) {
- $ccl_query = "$idx=$ccl_textbox" ;
+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);
- $ccl_query .= ' and ' if $ccl_textbox;
- $ccl_query .= "acqdate,st-date-normalized,ge=" . $datefrom->output("iso");
- }
+ $datefrom = $query->param('datefrom');
+ $dateto = $query->param('dateto');
+
+ if ($datefrom) {
+ $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,ge,st-date-normalized=" . $datefrom;
+ }
+ }
+ }
- if ($dateto) {
- $dateto = C4::Dates->new($dateto);
- $ccl_query .= ' and ' if ($ccl_textbox || $datefrom) ;
- $ccl_query .= "acqdate,st-date-normalized,le=". $dateto->output("iso");
- }
+ if ($dateto) {
+ $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,le,st-date-normalized=" . $dateto;
+ }
+ }
+ }
- my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
- ($error, $marcresults, $total_hits) =
- SimpleSearch($ccl_query, $offset, $resultsperpage);
+ my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
+ my $searcher = Koha::SearchEngine::Search->new({index => 'biblios'});
+ ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($ccl_query, $offset, $resultsperpage);
- if ($marcresults) {
- $show_results = scalar @$marcresults;
- } else {
- warn "ERROR label-item-search: no results from SimpleSearch";
+ if (!defined $error && @{$marcresults} ) {
+ $show_results = @{$marcresults};
+ }
+ else {
+ $debug and warn "ERROR label-item-search: no results from simple_search_compat";
- # leave $show_results undef
- }
+ # leave $show_results undef
+ }
}
if ($show_results) {
- my $hits = $show_results;
- my (@results, @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++) {
-
- #DEBUG Notes: Decode the MARC record from each resulting MARC record...
- my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
-
- #DEBUG Notes: Transform it to Koha form...
- my $biblio = TransformMarcToKoha(C4::Context->dbh, $marcrecord, '');
-
-# Begin building the hash for the template...
-# I don't think we need this with the current template design, but I'm leaving it in place. -fbcit
-#$biblio->{highlight} = ($i % 2)?(1):(0);
-#DEBUG Notes: Stuff the bib into @results...
- push @results, $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...
- my $iii = $itemnums->{$biblionumber};
- if ($iii) {
- 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[$i]->{'biblionumber'}) {
-
-# NOTE: The order of the elements in this array must be preserved or the table dependent on it will be incorrectly rendered.
-# This is a real hack, but I can't think of a better way right now. -fbcit
-# It is conceivable that itemcallnumber and/or barcode fields might be empty so the trinaries cover this possibility.
- push @{ $results[$i]->{'item'} }, { i_itemnumber1 =>
- $item_results->{$item}->{'itemnumber'} };
- push @{ $results[$i]->{'item'} },
- { i_itemcallnumber => (
- $item_results->{$item}->{'itemcallnumber'}
- ? $item_results->{$item}->{'itemcallnumber'} : 'NA'
- )
- };
- push @{ $results[$i]->{'item'} }, { i_dateaccessioned =>
- $item_results->{$item}->{'dateaccessioned'} };
- push @{ $results[$i]->{'item'} },
- { i_barcode => (
- $item_results->{$item}->{'barcode'}
- ? $item_results->{$item}->{'barcode'} : 'NA'
- )
- };
- push @{ $results[$i]->{'item'} }, { i_itemnumber2 =>
- $item_results->{$item}->{'itemnumber'} };
- }
- }
- }
- }
- $debug and warn "**********\@results**********\n";
- $debug and warn Dumper(@results);
-
- ($template, $loggedinuser, $cookie) = get_template_and_user(
- { template_name => "labels/result.tmpl",
- 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 $hits = $show_results;
+ my @results_set = ();
+ my @items =();
+ # This code needs to be refactored using these subs...
+ #my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
+ 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( $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 $items = Koha::Items->search({ biblionumber => $biblionumber }, { order_by => { -desc => 'itemnumber' }});
+ #DEBUG Notes: Retrieve the item data for each number...
+ 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);
+ }
+ }
- my ($from, $to, $startfromnext, $startfromprev, $displaynext, $displayprev);
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "labels/result.tt",
+ query => $query,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { borrowers => 'edit_borrowers' },
+ flagsrequired => { catalogue => 1 },
+ debug => 1,
+ }
+ );
- 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
- };
- }
+ # build page nav stuff.
+ my @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;
+ $from = $startfrom;
+ $startfromprev = $startfrom - $resultsperpage;
+ $startfromnext = $startfrom + $resultsperpage;
- $to =
- $startfrom + $resultsperpage > $total
- ? $total
- : $startfrom + $resultsperpage - 1;
+ $to =
+ $startfrom + $resultsperpage > $total
+ ? $total
+ : $startfrom + $resultsperpage - 1;
- # multi page display
- $displaynext = 0;
- $displayprev = $startfrom > 1 ? $startfrom : 0;
+ # multi page display
+ $displaynext = 0;
+ $displayprev = $startfrom > 1 ? $startfrom : 0;
- $displaynext = 1 if $to < $total_hits;
+ $displaynext = 1 if $to < $total_hits;
- } else {
+ }
+ else {
+ $from = 1;
+ $to = $total_hits;
$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(
+ total => $total_hits,
+ from => $from,
+ to => $to,
+ startfromnext => $startfromnext,
+ startfromprev => $startfromprev,
+ startfrom => $startfrom,
+ displaynext => $displaynext,
+ displayprev => $displayprev,
+ resultsperpage => $resultsperpage,
+ numbers => \@numbers,
+ );
- $template->param(
- result => \@results,
- batch_id => $batch_id,
- type => $type,
- idx => $idx,
- ccl_query => $ccl_query,
- );
+ $template->param(
+ results => ($show_results ? 1 : 0),
+ result_set=> \@results_set,
+ batch_id => $batch_id,
+ type => $type,
+ ccl_query => $ccl_query,
+ );
}
#
else {
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "labels/search.tmpl",
+ template_name => "labels/search.tt",
query => $query,
type => "intranet",
authnotrequired => 0,
debug => 1,
}
);
- my $itemtypes = GetItemTypes;
+ my $itemtypes = Koha::ItemTypes->search;
my @itemtypeloop;
- foreach my $thisitemtype (keys %$itemtypes) {
- my %row =(value => $thisitemtype,
- description => $itemtypes->{$thisitemtype}->{'description'},
- );
- push @itemtypeloop, \%row;
+ while ( my $itemtype = $itemtypes->next ) {
+ # FIXME This must be improved:
+ # - pass the iterator to the template
+ # - display the translated_description
+ my %row = (
+ value => $itemtype->itemtype,
+ description => $itemtype->description,
+ );
+ push @itemtypeloop, \%row;
}
$template->param(
- itemtypeloop =>\@itemtypeloop,
- batch_id => $batch_id,
- type => $type,
+ itemtypeloop => \@itemtypeloop,
+ batch_id => $batch_id,
+ type => $type,
);
}
-# Print the page
-$template->param(
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-);
-output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:
-
-
-
-
-
+$template->param( idx => $idx );
+# Print the page
+output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff