# WARNING: 4-character tab stops here
# Copyright 2000-2002 Katipo Communications
+# Parts Copyright 2010 Biblibre
#
# 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>.
=head1 NAME
=cut
+use Modern::Perl;
-use strict;
-
-use CGI;
+use CGI qw ( -utf8 );
use C4::Koha;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Biblio;
+use C4::Debug;
-my $input=new CGI;
-# my $type=$query->param('type');
-my $op = $input->param('op');
+use Koha::ItemTypes;
+use Koha::SearchEngine;
+use Koha::SearchEngine::Search;
+
+my $input = new CGI;
+my $op = $input->param('op') || q{};
my $dbh = C4::Context->dbh;
-my $startfrom=$input->param('startfrom');
-$startfrom=0 unless $startfrom;
-my ($template, $loggedinuser, $cookie);
+my $startfrom = $input->param('startfrom');
+$startfrom = 0 unless $startfrom;
+my ( $template, $loggedinuser, $cookie );
my $resultsperpage;
+my $itype_or_itemtype =
+ ( C4::Context->preference("item-level_itypes") ) ? 'itype' : 'itemtype';
+
my $query = $input->param('q');
+
# don't run the search if no search term !
-if ($op eq "do_search" && $query) {
+if ( $op eq "do_search" && $query ) {
+
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "serials/result.tt",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { catalogue => 1, serials => '*' },
+ debug => 1,
+ }
+ );
- # add the itemtype limit if applicable
+ # add the limits if applicable
my $itemtypelimit = $input->param('itemtypelimit');
- if ( $itemtypelimit ) {
- my $index = C4::Context->preference("item-level_itypes") ? 'itype' : 'itemtype';
- $query .= " AND $index=$itemtypelimit";
+ my $ccodelimit = $input->param('ccodelimit');
+ my $op = 'and';
+ $query .= " $op $itype_or_itemtype:$itemtypelimit" if $itemtypelimit;
+ $query .= " $op ccode:$ccodelimit" if $ccodelimit;
+ $debug && warn $query;
+ $resultsperpage = $input->param('resultsperpage');
+ $resultsperpage = 20 if ( !defined $resultsperpage );
+
+ my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
+ my ( $error, $marcrecords, $total_hits ) =
+ $searcher->simple_search_compat( $query, $startfrom * $resultsperpage, $resultsperpage );
+ my $total = 0;
+ if ( defined $marcrecords ) {
+ $total = scalar @{$marcrecords};
}
-
- $resultsperpage= $input->param('resultsperpage');
- $resultsperpage = 20 if(!defined $resultsperpage);
-
- my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
- my $total = scalar @$marcrecords;
- if (defined $error) {
- $template->param(query_error => $error);
- warn "error: ".$error;
+ if ( defined $error ) {
+ $template->param( query_error => $error );
+ warn "error: " . $error;
output_html_with_http_headers $input, $cookie, $template->output;
exit;
}
my @results;
-
- for(my $i=0;$i<$total;$i++) {
+
+ for ( my $i = 0 ; $i < $total ; $i++ ) {
my %resultsloop;
- my $marcrecord = MARC::File::USMARC::decode($marcrecords->[$i]);
- my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
+ my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $marcrecords->[$i] );
+ my $biblio = TransformMarcToKoha( $marcrecord, '' );
#build the hash for the template.
- $resultsloop{highlight} = ($i % 2)?(1):(0);
+ $resultsloop{highlight} = ( $i % 2 ) ? (1) : (0);
$resultsloop{title} = $biblio->{'title'};
$resultsloop{subtitle} = $biblio->{'subtitle'};
+ $resultsloop{medium} = $biblio->{'medium'};
+ $resultsloop{part_number} = $biblio->{'part_number'};
+ $resultsloop{part_name} = $biblio->{'part_name'};
$resultsloop{biblionumber} = $biblio->{'biblionumber'};
$resultsloop{author} = $biblio->{'author'};
$resultsloop{publishercode} = $biblio->{'publishercode'};
- $resultsloop{publicationyear} = $biblio->{'publicationyear'};
+ $resultsloop{publicationyear} = $biblio->{'publicationyear'} ? $biblio->{'publicationyear'} : $biblio->{'copyrightdate'};
+ $resultsloop{issn} = $biblio->{'issn'};
push @results, \%resultsloop;
}
-
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "serials/result.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {serials => 1},
- flagsrequired => {catalogue => 1},
- debug => 1,
- });
# multi page display gestion
- my $displaynext=0;
- my $displayprev=$startfrom;
- if(($total_hits - (($startfrom+1)*($resultsperpage))) > 0 ){
+ my $displaynext = 0;
+ my $displayprev = $startfrom;
+ if ( ( $total_hits - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
$displaynext = 1;
}
-
my @numbers = ();
- if ($total_hits>$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=> \@results,
- startfrom => ($i-1)};
+ if ( $total_hits > $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 => \@results,
+ startfrom => ( $i - 1 )
+ };
}
}
}
-
+
my $from = 0;
- $from = $startfrom*$resultsperpage+1 if($total_hits > 0);
+ $from = $startfrom * $resultsperpage + 1 if ( $total_hits > 0 );
my $to;
- if($total_hits < (($startfrom+1)*$resultsperpage))
- {
+ if ( $total_hits < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
$to = $total;
- } else {
- $to = (($startfrom+1)*$resultsperpage);
+ }
+ else {
+ $to = ( ( $startfrom + 1 ) * $resultsperpage );
}
$template->param(
- query => $query,
- resultsloop => \@results,
- startfrom=> $startfrom,
- displaynext=> $displaynext,
- displayprev=> $displayprev,
- resultsperpage => $resultsperpage,
- startfromnext => $startfrom+1,
- startfromprev => $startfrom-1,
- total=>$total_hits,
- from=>$from,
- to=>$to,
- numbers=>\@numbers,
- );
-} # end of if ($op eq "do_search" & $query)
- elsif ($op eq "do_search") {
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {catalogue => 1, serials=>1},
- debug => 1,
- });
+ query => $query,
+ resultsloop => \@results,
+ startfrom => $startfrom,
+ displaynext => $displaynext,
+ displayprev => $displayprev,
+ resultsperpage => $resultsperpage,
+ startfromnext => $startfrom + 1,
+ startfromprev => $startfrom - 1,
+ total => $total_hits,
+ from => $from,
+ to => $to,
+ numbers => \@numbers,
+ );
+} # end of if ($op eq "do_search" & $query)
+else {
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "serials/subscription-bib-search.tt",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { catalogue => 1, serials => '*' },
+ debug => 1,
+ }
+ );
+
# load the itemtypes
- my $itemtypes = GetItemTypes;
+ my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
my @itemtypesloop;
- my $selected=1;
- my $cnt;
- foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
- my %row =(
- code => $thisitemtype,
- selected => $selected,
- description => $itemtypes->{$thisitemtype}->{'description'},
- );
- $selected = 0 if ($selected) ;
+ # FIXME This is uselessly complex, the iterator should be send to the template
+ # FIXME The translated_description should be used
+ foreach my $thisitemtype (
+ sort {
+ $itemtypes->{$a}->{'description'}
+ cmp $itemtypes->{$b}->{'description'}
+ } keys %$itemtypes
+ )
+ {
+ my %row = (
+ code => $thisitemtype,
+ description => $itemtypes->{$thisitemtype}->{'description'},
+ );
push @itemtypesloop, \%row;
}
- $template->param(itemtypeloop => \@itemtypesloop);
- $template->param("no_query" => 1);
-}
- else {
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {catalogue => 1, serials=>1},
- debug => 1,
- });
- # load the itemtypes
- my $itemtypes = GetItemTypes;
- my @itemtypesloop;
- my $selected=1;
- my $cnt;
- foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
- my %row =(
- code => $thisitemtype,
- selected => $selected,
- description => $itemtypes->{$thisitemtype}->{'description'},
- );
- $selected = 0 if ($selected) ;
- push @itemtypesloop, \%row;
+
+ # load Collection Codes
+ my $authvalues = GetAuthorisedValues('CCODE');
+ my @ccodesloop;
+ for my $thisauthvalue ( sort { $a->{'lib'} cmp $b->{'lib'} } @$authvalues )
+ {
+ my %row = (
+ code => $thisauthvalue->{'authorised_value'},
+ description => $thisauthvalue->{'lib'},
+ );
+ push @ccodesloop, \%row;
}
- $template->param(itemtypeloop => \@itemtypesloop);
- $template->param("no_query" => 0);
+
+ $template->param(
+ itemtypeloop => \@itemtypesloop,
+ ccodeloop => \@ccodesloop,
+ no_query => $op eq "do_search" ? 1 : 0,
+ );
}
# Print the page
projects / koha-equinox.git / blobdiff