use strict;
-require Exporter;
+use warnings;
+
use CGI;
use C4::Koha;
use C4::Auth;
my ($template, $loggedinuser, $cookie);
my $resultsperpage;
-if ($op eq "do_search") {
- my $query = $input->param('q');
+my $query = $input->param('q');
+# don't run the search if no search term !
+if ($op eq "do_search" && $query) {
+
+ # add the itemtype limit if applicable
+ my $itemtypelimit = $input->param('itemtypelimit');
+ if ( $itemtypelimit ) {
+ my $index = C4::Context->preference("item-level_itypes") ? 'itype' : 'itemtype';
+ $query .= " AND $index=$itemtypelimit";
+ }
$resultsperpage= $input->param('resultsperpage');
- $resultsperpage = 19 if(!defined $resultsperpage);
+ $resultsperpage = 20 if(!defined $resultsperpage);
- my ($error,$marcrecords) = SimpleSearch($query);
+ my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
my $total = scalar @$marcrecords;
if (defined $error) {
exit;
}
my @results;
- warn "total=".$total;
-
+
for(my $i=0;$i<$total;$i++) {
my %resultsloop;
my $marcrecord = MARC::File::USMARC::decode($marcrecords->[$i]);
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},
+ flagsrequired => {catalogue => 1, serials => '*'},
debug => 1,
});
# multi page display gestion
my $displaynext=0;
my $displayprev=$startfrom;
- if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
+ if(($total_hits - (($startfrom+1)*($resultsperpage))) > 0 ){
$displaynext = 1;
}
my @numbers = ();
- if ($total>$resultsperpage)
+ if ($total_hits>$resultsperpage)
{
for (my $i=1; $i<$total/$resultsperpage+1; $i++)
{
}
}
- my $from = $startfrom*$resultsperpage+1;
+ my $from = 0;
+ $from = $startfrom*$resultsperpage+1 if($total_hits > 0);
my $to;
- if($total < (($startfrom+1)*$resultsperpage))
+ if($total_hits < (($startfrom+1)*$resultsperpage))
{
$to = $total;
} else {
resultsperpage => $resultsperpage,
startfromnext => $startfrom+1,
startfromprev => $startfrom-1,
- total=>$total,
+ total=>$total_hits,
from=>$from,
to=>$to,
numbers=>\@numbers,
);
-} # end of if ($op eq "do_search")
+} # 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 => '*'},
+ 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;
+ }
+ $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},
+ flagsrequired => {catalogue => 1, serials => '*'},
debug => 1,
});
-
- my %itemtypes = GetItemTypes();
- my @values = values %itemtypes;
- my $CGIitemtype=CGI::scrolling_list(
- -name => 'value',
- -values => \@values,
- -labels => \%itemtypes,
- -size => 1,
- -multiple => 0
- );
-
- $template->param(
- CGIitemtype => $CGIitemtype,
- );
+ # 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;
+ }
+ $template->param(itemtypeloop => \@itemtypesloop);
+ $template->param("no_query" => 0);
}
# Print the page