X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-bib-search.pl;h=623efe28f9bcd02eedd6874d65f0857792f90a4b;hb=c82d114f1ef6dfc8abc289e01b104e1c4a5d290e;hp=6f28c43865a39c50644895e4c4b3a0099d537761;hpb=100e6a9808ead4ee8d951da59ead1550e75bb4c3;p=koha_fer diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl index 6f28c43865..623efe28f9 100755 --- a/serials/subscription-bib-search.pl +++ b/serials/subscription-bib-search.pl @@ -2,6 +2,7 @@ # WARNING: 4-character tab stops here # Copyright 2000-2002 Katipo Communications +# Parts Copyright 2010 Biblibre # # This file is part of Koha. # @@ -14,9 +15,9 @@ # 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 NAME @@ -48,7 +49,8 @@ to multipage gestion. use strict; -require Exporter; +use warnings; + use CGI; use C4::Koha; use C4::Auth; @@ -56,10 +58,11 @@ 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'); +my $op = $input->param('op') || q{}; my $dbh = C4::Context->dbh; my $startfrom=$input->param('startfrom'); @@ -67,14 +70,41 @@ $startfrom=0 unless $startfrom; my ($template, $loggedinuser, $cookie); my $resultsperpage; -if ($op eq "do_search") { - my $query = $input->param('q'); +my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes"); +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) { + + ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { template_name => "serials/result.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {catalogue => 1, serials => '*'}, + debug => 1, + } + ); + # add the itemtype limit if applicable + my $itemtypelimit = $input->param('itemtypelimit'); + if ( $itemtypelimit ) { + if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { + $query .= " AND $itype_or_itemtype=$itemtypelimit"; + } else { + $query .= " AND $advanced_search_types=$itemtypelimit"; + } + } + $debug && warn $query; $resultsperpage= $input->param('resultsperpage'); - $resultsperpage = 19 if(!defined $resultsperpage); + $resultsperpage = 20 if(!defined $resultsperpage); - my ($error,$marcrecords) = SimpleSearch($query); - my $total = scalar @$marcrecords; + my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage); + my $total = 0; + if (defined $marcrecords ) { + $total = scalar @{$marcrecords}; + } if (defined $error) { $template->param(query_error => $error); @@ -83,8 +113,7 @@ if ($op eq "do_search") { exit; } my @results; - warn "total=".$total; - + for(my $i=0;$i<$total;$i++) { my %resultsloop; my $marcrecord = MARC::File::USMARC::decode($marcrecords->[$i]); @@ -98,31 +127,22 @@ if ($op eq "do_search") { $resultsloop{author} = $biblio->{'author'}; $resultsloop{publishercode} = $biblio->{'publishercode'}; $resultsloop{publicationyear} = $biblio->{'publicationyear'}; + $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 - (($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++) { @@ -138,10 +158,11 @@ if ($op eq "do_search") { } } - 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 { @@ -156,37 +177,66 @@ if ($op eq "do_search") { 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") - else { +} # end of if ($op eq "do_search" & $query) +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, }); + # load the itemtypes + my $itemtypes = GetItemTypes; + my @itemtypesloop; + if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { + # load the itemtypes + my $itemtypes = GetItemTypes; + 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; + } - 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, - ); -} + } else { + my $advsearchtypes = GetAuthorisedValues($advanced_search_types); + my $cnt; + my $selected=1; + for my $thisitemtype (sort {$a->{'lib'} cmp $b->{'lib'}} @$advsearchtypes) { + my %row =( + number=>$cnt++, + ccl => $advanced_search_types, + code => $thisitemtype->{authorised_value}, + selected => $selected, + description => $thisitemtype->{'lib'}, + count5 => $cnt % 4, + imageurl=> getitemtypeimagelocation( 'intranet', $thisitemtype->{'imageurl'} ), + ); + push @itemtypesloop, \%row; + } + } + + if ($op eq "do_search") { + $template->param("no_query" => 1); + } else { + $template->param("no_query" => 0); + } + $template->param(itemtypeloop => \@itemtypesloop); +} # Print the page output_html_with_http_headers $input, $cookie, $template->output;