#!/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
-
-use strict;
-use CGI;
-use C4::Auth;
-use HTML::Template::Pro;
-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 qw( DHTMLcalendar );
-use C4::Koha; # XXX subfield_is_koha_internal_p
-
-#use Smart::Comments;
-use Data::Dumper;
-
-# 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 $type = $query->param('type');
-my $op = $query->param('op');
-my $batch_id = $query->param('batch_id');
-my $dateaccessioned = $query->param('dateaccessioned');
-
-my $dbh = C4::Context->dbh;
-
-my $startfrom = $query->param('startfrom') || 0;
-my ( $template, $loggedinuser, $cookie );
-my (@marclist,@and_or,@excluding,@operator,@value,$orderby,@tags,$results,$total,$error,$marcresults);
-my $resultsperpage = $query->param('resultsperpage') || 19;
+# 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 CGI qw ( -utf8 );
+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::Search qw( new_record_from_zebra );
+use C4::Biblio qw( TransformMarcToKoha );
+use C4::Creators::Lib qw( html_table );
+
+use Koha::Logger;
+use Koha::Items;
+use Koha::ItemTypes;
+use Koha::SearchEngine::Search;
+
+my $query = CGI->new;
+
+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, $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" ) {
- @marclist = $query->param('marclist');
- @and_or = $query->param('and_or');
- @excluding = $query->param('excluding');
- @operator = $query->param('operator');
- @value = $query->param('value');
- $orderby = $query->param('orderby');
- if (scalar @marclist) {
- #catalogsearch( $dbh, \@tags, \@and_or, \@excluding, \@operator, \@value,
- # $startfrom * $resultsperpage,
- # $resultsperpage, $orderby );
- ($error, $marcresults) = SimpleSearch($marclist[0]);
- if ($marcresults) {
- $show_results = scalar @$marcresults;
- } else {
- warn "ERROR label-item-search: no results from SimpleSearch";
- # leave $show_results undef
- }
- }
+ $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) {
+ $ccl_query .= ' AND ' if $ccl_textbox;
+ $ccl_query .= "acqdate,ge,st-date-normalized=" . $datefrom;
+ }
+
+ if ($dateto) {
+ $ccl_query .= ' AND ' if ( $ccl_textbox || $datefrom );
+ $ccl_query .= "acqdate,le,st-date-normalized=" . $dateto;
+ }
+
+ 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 (!defined $error && @{$marcresults} ) {
+ $show_results = @{$marcresults};
+ }
+ else {
+ Koha::Logger->get->warn("ERROR label-item-search: no results from simple_search_compat");
+
+ # leave $show_results undef
+ }
}
-if ( $show_results ) {
- my $hits = $show_results;
- my (@results,@results2);
- # 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,'');
- #build the hash for the template.
- $biblio->{highlight} = ($i % 2)?(1):(0);
- #DEBUG Notes: Stuff it into @results... (used below to supply fields not existing in the item data)
- 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 @titem_results = GetItemsInfo( $itemnums->{$biblionumber}, 'intra' );
- my $item_results = GetItemInfosOf( @$iii );
- foreach my $item (keys %$item_results) {
- for my $bibdata (keys %{$results[$i]}) {
- if ( !$item_results->{$item}{$bibdata} ) { #Only add the data from the bibliodata if the data does not already exit in itemdata.
- #Otherwise we just build duplicate records rather than unique records per item.
- $item_results->{$item}{$bibdata} = $results[$i]->{$bibdata};
- }
- }
- #DEBUG Notes: After merging the bib and item data, stuff the results into $results2...
- push @results2, $item_results->{$item};
- }
- #warn Dumper(@results2);
- }
+if ($show_results) {
+ my $hits = $show_results;
+ my @results_set = ();
+ my @items =();
+ 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({ record => $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);
+ }
}
+
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "labels/result.tmpl",
+ template_name => "labels/result.tt",
query => $query,
type => "intranet",
- authnotrequired => 0,
- flagsrequired => { borrowers => 1 },
+ flagsrequired => { borrowers => 'edit_borrowers' },
flagsrequired => { catalogue => 1 },
- debug => 1,
}
);
- # multi page display gestion
- my $displaynext = 0;
- my $displayprev = $startfrom;
- if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
- $displaynext = 1;
- }
-
- my @field_data = ();
+ # build page nav stuff.
+ my @numbers;
+ $total = $total_hits;
- # FIXME: this relies on symmetric order of CGI params that IS NOT GUARANTEED by spec.
+ my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
+ $displayprev );
- for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
- push @field_data, { term => "marclist", val => $marclist[$i] };
- push @field_data, { term => "and_or", val => $and_or[$i] };
- push @field_data, { term => "excluding", val => $excluding[$i] };
- push @field_data, { term => "operator", val => $operator[$i] };
- push @field_data, { term => "value", val => $value[$i] };
- }
-
- my @numbers = ();
if ( $total > $resultsperpage ) {
- for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
- if ( $i < 16 ) {
- my $highlight = 0;
- ( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
- push @numbers,
- {
- number => $i,
- highlight => $highlight,
- searchdata => \@field_data,
- startfrom => ( $i - 1 )
- };
- }
+ 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 {
+ $from = 1;
+ $to = $total_hits;
+ $displayprev = 0;
+ $displaynext = 0;
}
- my $from = $startfrom * $resultsperpage + 1;
- my $temp = ( $startfrom + 1 ) * $resultsperpage;
- my $to = ($total < $temp) ? $total : $temp;
-
- # this gets the results of the search (which are bibs)
- # and then does a lookup on all items that exist for that bib
- # then pushes the items onto a new array, as we really want the
- # items attached to the bibs not thew bibs themselves
-
- # my @results2;
- # for (my $i = 0 ; $i < $total ; $i++ )
- # {
- #warn $i;
- #warn Dumper $results->[$i]{'bibid'};
- # my $type = 'intra';
- # my @item_results = &ItemInfo( 0, $results->[$i]{'biblionumber'}, $type );
- # FIXME: ItemInfo doesn't exist !!
-# push @results2,\@item_results;
- # foreach my $item (@item_results) {
- # warn Dumper $item;
- # push @results2, $item;
- # }
-# }
-#
$template->param(
- result => \@results2,
+ total => $total_hits,
+ from => $from,
+ to => $to,
+ startfromnext => $startfromnext,
+ startfromprev => $startfromprev,
startfrom => $startfrom,
displaynext => $displaynext,
displayprev => $displayprev,
resultsperpage => $resultsperpage,
- startfromnext => $startfrom + 1,
- startfromprev => $startfrom - 1,
- searchdata => \@field_data,
- total => $total,
- from => $from,
- to => $to,
numbers => \@numbers,
- batch_id => $batch_id,
+ );
+
+ $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,
flagsrequired => { catalogue => 1 },
- debug => 1,
}
);
-
- #using old rel2.2 getitemtypes for testing!!!!, not devweek's GetItemTypes()
-
- my $itemtypes = GetItemTypes;
+ my $itemtypes = Koha::ItemTypes->search;
my @itemtypeloop;
- my ($thisitemtype );
- 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,
+ itemtypeloop => \@itemtypeloop,
batch_id => $batch_id,
+ type => $type,
);
}
+
+$template->param( idx => $idx );
+
# 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: