X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-bib-search.pl;h=90a40989a136f1fb109337ef3ce30583f6694eda;hb=aacf00e94bc6aded555624aae834f045c8a17700;hp=01c341db74aa1e8156fcbeb5c25a6e3837eba98c;hpb=d914fb60dfb4ae95c34dc488c3c1805d23b5919e;p=koha_fer diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl index 01c341db74..90a40989a1 100755 --- a/serials/subscription-bib-search.pl +++ b/serials/subscription-bib-search.pl @@ -14,9 +14,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,6 +48,7 @@ to multipage gestion. use strict; +use warnings; use CGI; use C4::Koha; @@ -56,10 +57,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,6 +69,9 @@ $startfrom=0 unless $startfrom; my ($template, $loggedinuser, $cookie); my $resultsperpage; +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) { @@ -74,14 +79,17 @@ 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"; + 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, $total_hits) = SimpleSearch($query, $startfrom, $resultsperpage); + my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage); my $total = scalar @$marcrecords; if (defined $error) { @@ -91,7 +99,7 @@ if ($op eq "do_search" && $query) { exit; } my @results; - + for(my $i=0;$i<$total;$i++) { my %resultsloop; my $marcrecord = MARC::File::USMARC::decode($marcrecords->[$i]); @@ -108,7 +116,7 @@ if ($op eq "do_search" && $query) { push @results, \%resultsloop; } - + ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/result.tmpl", query => $input, @@ -122,14 +130,14 @@ if ($op eq "do_search" && $query) { # 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++) { @@ -145,10 +153,11 @@ if ($op eq "do_search" && $query) { } } - 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 { @@ -163,39 +172,48 @@ if ($op eq "do_search" && $query) { 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" & $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, - }); - # load the itemtypes - my $itemtypes = GetItemTypes; + else { 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; + 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; + } + + + } 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; + } } - $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, @@ -204,24 +222,15 @@ if ($op eq "do_search" && $query) { 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; + + + if ($op eq "do_search") { + $template->param("no_query" => 1); + } else { + $template->param("no_query" => 0); } $template->param(itemtypeloop => \@itemtypesloop); - $template->param("no_query" => 0); } - # Print the page output_html_with_http_headers $input, $cookie, $template->output;