#!/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;
-require Exporter;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use HTML::Template;
-use C4::Context;
-use C4::Search;
-use C4::Auth;
-use C4::Output;
-use C4::Biblio;
-use C4::Acquisition;
-use C4::Search;
-use C4::Koha; # XXX subfield_is_koha_internal_p
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
-#use Smart::Comments;
-#use Data::Dumper;
+use Modern::Perl;
+use vars qw($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.
+use CGI qw ( -utf8 );
+use List::Util qw( max min );
+use POSIX qw(ceil);
-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');
-
-### $query;
-
-my $dbh = C4::Context->dbh;
+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::Creators::Lib qw(html_table);
+use C4::Debug;
+
+use Koha::DateUtils;
+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 $startfrom = $query->param('startfrom');
-$startfrom = 0 if ( !defined $startfrom );
-my ( $template, $loggedinuser, $cookie );
-my $resultsperpage;
+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, $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 @marclist = $query->param('marclist');
- my @and_or = $query->param('and_or');
- my @excluding = $query->param('excluding');
- my @operator = $query->param('operator');
- my @value = $query->param('value');
-
- $resultsperpage = $query->param('resultsperpage');
- $resultsperpage = 19 if ( !defined $resultsperpage );
- my $orderby = $query->param('orderby');
-
- # builds tag and subfield arrays
- my @tags;
-
- my ( $results, $total ) ;
- #catalogsearch( $dbh, \@tags, \@and_or, \@excluding, \@operator, \@value,
- # $startfrom * $resultsperpage,
- # $resultsperpage, $orderby );
+ 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";
+ }
-#use Data::Dumper;
-my $searchquery=$marclist[0];
-my ($error, $marcresults) = SimpleSearch($searchquery);
+ $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;
+ }
+ }
+ }
-my $hits = scalar @$marcresults;
-my @results;
-my $results;
+ 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;
+ my $searcher = Koha::SearchEngine::Search->new({index => 'biblios'});
+ ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($ccl_query, $offset, $resultsperpage);
-for(my $i=0;$i<$hits;$i++) {
- my %resultsloop;
- my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
- my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
- #build the hash for the template.
- %resultsloop=%$biblio;
- $resultsloop{highlight} = ($i % 2)?(1):(0);
-#warn $resultsloop{biblionumber};
+ if (!defined $error && @{$marcresults} ) {
+ $show_results = @{$marcresults};
+ }
+ else {
+ $debug and warn "ERROR label-item-search: no results from simple_search_compat";
- push @results, \%resultsloop;
+ # leave $show_results undef
+ }
}
- my @results2;
- my $i;
- for ( $i = 0 ; $i <= ( $hits - 1 ) ; $i++ ) {
-
- my $itemnums = get_itemnumbers_of($results[$i]->{'biblionumber'});
- my $iii = $itemnums->{$results[$i]->{'biblionumber'} } ;
- my $item_results;
- if ($iii ) {
- $item_results = &GetItemInfosOf( @$iii );
- }
- foreach my $item (keys %$item_results) {
- for my $bibdata (keys %{$results[$i]}) {
-#warn Dumper($bibdata);
-#warn Dumper($results[$i]->{$bibdata});
- $item_results->{$item}{$bibdata} = $results[$i]->{$bibdata};
- }
- push @results2, $item_results->{$item};
+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' );
+ 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);
}
-
}
- ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+
+ ( $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;
- 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 = ();
+ my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
+ $displayprev );
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
+ };
}
- }
-
- my $from = $startfrom * $resultsperpage + 1;
- my $to;
-
- if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
- $to = $total;
- }
- else {
- $to = ( ( $startfrom + 1 ) * $resultsperpage );
- }
- # 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
+ $from = $startfrom;
+ $startfromprev = $startfrom - $resultsperpage;
+ $startfromnext = $startfrom + $resultsperpage;
- # my @results2;
- my $i;
- for ( $i = 0 ; $i <= ( $total - 1 ) ; $i++ )
- { #total-1 coz the array starts at 0
- #warn $i;
- #warn Dumper $results->[$i]{'bibid'};
- my $type = 'intra';
- my @item_results =
- &ItemInfo( 0, $results->[$i]{'biblionumber'}, $type );
+ $to =
+ $startfrom + $resultsperpage > $total
+ ? $total
+ : $startfrom + $resultsperpage - 1;
- foreach my $item (@item_results) {
+ # multi page display
+ $displaynext = 0;
+ $displayprev = $startfrom > 1 ? $startfrom : 0;
- #warn Dumper $item;
- push @results2, $item;
- }
+ $displaynext = 1 if $to < $total_hits;
}
+ else {
+ $from = 1;
+ $to = $total_hits;
+ $displayprev = 0;
+ $displaynext = 0;
+ }
$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,
);
}
-#
#
# search section
#
-#
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,
}
);
-
-
- #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 => get_date_format_string_for_DHTMLcalendar(),
-);
output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:
projects / koha.git / blobdiff