X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-search.pl;h=ff437da323b4148f657f818616ab6b7da61c74b4;hb=e5ff85d5562330dbd34410249ad04f4a478a0a04;hp=45cb7664a60a43fbb94798b8dfa8bc26c16a4ae7;hpb=826eda9d7045e970e6989fef7feb5f013e81e675;p=koha.git diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 45cb7664a6..ff437da323 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # Copyright 2008 Garry Collum and the Koha Koha Development team +# Copyright 2010 BibLibre # # This file is part of Koha. # @@ -65,7 +66,7 @@ my $build_grouped_results = C4::Context->preference('OPACGroupResults'); if ($format =~ /(rss|atom|opensearchdescription)/) { $template_name = 'opac-opensearch.tmpl'; } -elsif ($build_grouped_results) { +elsif (@params && $build_grouped_results) { $template_name = 'opac-results-grouped.tmpl'; } elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) { @@ -80,9 +81,12 @@ else { template_name => $template_name, query => $cgi, type => "opac", - authnotrequired => 1, + authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), } ); +if ($template_name eq 'opac-results.tmpl') { + $template->param('COinSinOPACResults' => C4::Context->preference('COinSinOPACResults')); +} if ($format eq 'rss2' or $format eq 'opensearchdescription' or $format eq 'atom') { $template->param($format => 1); @@ -139,10 +143,9 @@ if (C4::Context->preference('TagsEnabled')) { #} # load the branches -my $mybranch = ( C4::Context->preference('SearchMyLibraryFirst') && C4::Context->userenv && C4::Context->userenv->{branch} ) ? C4::Context->userenv->{branch} : ''; + my $branches = GetBranches(); # used later in *getRecords, probably should be internalized by those functions after caching in C4::Branch is established $template->param( - branchloop => GetBranchesLoop($mybranch, 0), searchdomainloop => GetBranchCategories(undef,'searchdomain'), ); @@ -161,8 +164,8 @@ my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes"); if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { - my %row =( number=>$cnt++, - ccl => $itype_or_itemtype, + my %row =( number=>$cnt++, + ccl => "$itype_or_itemtype,phr", code => $thisitemtype, selected => $selected, description => $itemtypes->{$thisitemtype}->{'description'}, @@ -195,7 +198,6 @@ $template->param(itemtypeloop => \@itemtypesloop); # The following should only be loaded if we're bringing up the advanced search template if ( $template_type && $template_type eq 'advsearch' ) { - # load the servers (used for searching -- to do federated searching, etc.) my $primary_servers_loop;# = displayPrimaryServers(); $template->param(outer_servers_loop => $primary_servers_loop,); @@ -204,15 +206,19 @@ if ( $template_type && $template_type eq 'advsearch' ) { $template->param(outer_sup_servers_loop => $secondary_servers_loop,); # set the default sorting - my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') - if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder')); - $template->param($default_sort_by => 1); + if ( C4::Context->preference('OPACdefaultSortField') + && C4::Context->preference('OPACdefaultSortOrder') ) { + my $default_sort_by = + C4::Context->preference('OPACdefaultSortField') . '_' + . C4::Context->preference('OPACdefaultSortOrder'); + $template->param( sort_by => $default_sort_by ); + } # determine what to display next to the search boxes (ie, boolean option # shouldn't appear on the first one, scan indexes should, adding a new # box should only appear on the last, etc. my @search_boxes_array; - my $search_boxes_count = C4::Context->preference("OPACAdvSearchInputCount") || 3; + my $search_boxes_count = 3; # begin whith 3 boxes for (my $i=1;$i<=$search_boxes_count;$i++) { # if it's the first one, don't display boolean option, but show scan indexes if ($i==1) { @@ -270,13 +276,21 @@ $tag = $params->{tag} if $params->{tag}; # sort by is used to sort the query # in theory can have more than one but generally there's just one my @sort_by; -my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') - if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder')); +my $default_sort_by; +if ( C4::Context->preference('OPACdefaultSortField') + && C4::Context->preference('OPACdefaultSortOrder') ) { + $default_sort_by = + C4::Context->preference('OPACdefaultSortField') . '_' + . C4::Context->preference('OPACdefaultSortOrder'); +} +my @allowed_sortby = qw /acqdate_asc acqdate_dsc author_az author_za call_number_asc call_number_dsc popularity_asc popularity_dsc pubdate_asc pubdate_dsc relevance title_az title_za/; @sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'}; $sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by); foreach my $sort (@sort_by) { - $template->param($sort => 1); # FIXME: security hole. can set any TMPL_VAR here + if ( $sort ~~ @allowed_sortby ) { + $template->param($sort => 1); + } } $template->param('sort_by' => $sort_by[0]); @@ -317,7 +331,7 @@ my @limits; @limits = split("\0",$params->{'limit'}) if $params->{'limit'}; if($params->{'multibranchlimit'}) { -push @limits, join(" or ", map { "branch: $_ "} @{GetBranchesInCategory($params->{'multibranchlimit'})}) ; + push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')'; } my $available; @@ -345,6 +359,7 @@ if ($params->{'limit-yr'}) { # Params that can only have one value my $scan = $params->{'scan'}; my $count = C4::Context->preference('OPACnumSearchResults') || 20; +my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; my $results_per_page = $params->{'count'} || $count; my $offset = $params->{'offset'} || 0; my $page = $cgi->param('page') || 1; @@ -358,7 +373,7 @@ my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_ my @results; ## I. BUILD THE QUERY -my $lang = C4::Output::getlanguagecookie($cgi); +my $lang = C4::Templates::getlanguagecookie($cgi); ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang); sub _input_cgi_parse ($) { @@ -390,6 +405,7 @@ if (C4::Context->preference('OpacSuppression')) { } $template->param ( LIMIT_INPUTS => \@limit_inputs ); +$template->param ( OPACResultsSidebar => C4::Context->preference('OPACResultsSidebar')); ## II. DO THE SEARCH AND GET THE RESULTS my $total = 0; # the total results for the whole set @@ -427,6 +443,7 @@ if ($facets) { foreach my $f (@$facets) { $f->{facets} = [ sort { uc($a->{facet_title_value}) cmp uc($b->{facet_title_value}) } @{ $f->{facets} } ]; } + @$facets = sort {$a->{expand} cmp $b->{expand}} @$facets; } # use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref); @@ -468,9 +485,11 @@ for (my $i=0;$i<@servers;$i++) { limit=>$tag_quantity }); } } - foreach (@newresults) { - $_->{coins} = GetCOinSBiblio($_->{'biblionumber'}); - } + if (C4::Context->preference('COinSinOPACResults')) { + foreach (@newresults) { + $_->{coins} = GetCOinSBiblio($_->{'biblionumber'}); + } + } if ($results_hashref->{$server}->{"hits"}){ $total = $total + $results_hashref->{$server}->{"hits"}; @@ -504,6 +523,7 @@ for (my $i=0;$i<@servers;$i++) { $template->param(ShowOpacRecentSearchLink => 1); } + shift @recentSearches if (@recentSearches > 15); # Pushing the cookie back $newsearchcookie = $cgi->cookie( -name => 'KohaOpacRecentSearches', @@ -540,6 +560,7 @@ for (my $i=0;$i<@servers;$i++) { $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity; $template->param(limit_cgi_not_availablity => $limit_cgi_not_availablity); $template->param(limit_cgi => $limit_cgi); + $template->param(countrss => $countRSS ); $template->param(query_cgi => $query_cgi); $template->param(query_desc => $query_desc); $template->param(limit_desc => $limit_desc); @@ -559,8 +580,13 @@ for (my $i=0;$i<@servers;$i++) { my $pages = ceil($hits / $results_per_page); # default page number my $current_page_number = 1; - $current_page_number = ($offset / $results_per_page + 1) if $offset; - my $previous_page_offset = $offset - $results_per_page unless ($offset - $results_per_page <0); + if ($offset) { + $current_page_number = ( $offset / $results_per_page + 1 ); + } + my $previous_page_offset; + if ( $offset >= $results_per_page ) { + $previous_page_offset = $offset - $results_per_page; + } my $next_page_offset = $offset + $results_per_page; # If we're within the first 10 pages, keep it simple #warn "current page:".$current_page_number; @@ -574,11 +600,14 @@ for (my $i=0;$i<@servers;$i++) { my $this_offset = (($i*$results_per_page)-$results_per_page); # the page number for this page my $this_page_number = $i; - # it should only be highlighted if it's the current page - my $highlight = 1 if ($this_page_number == $current_page_number); # put it in the array - push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by }; - + push @page_numbers, + { offset => $this_offset, + pg => $this_page_number, + highlight => $this_page_number == $current_page_number, + sort_by => join ' ', @sort_by + }; + } } @@ -587,9 +616,13 @@ for (my $i=0;$i<@servers;$i++) { for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) { my $this_offset = ((($i-9)*$results_per_page)-$results_per_page); my $this_page_number = $i-9; - my $highlight = 1 if ($this_page_number == $current_page_number); - if ($this_page_number <= $pages) { - push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by }; + if ( $this_page_number <= $pages ) { + push @page_numbers, + { offset => $this_offset, + pg => $this_page_number, + highlight => $this_page_number == $current_page_number, + sort_by => join ' ', @sort_by + }; } } @@ -628,6 +661,7 @@ $template->param( total => $total, opacfacets => 1, facets_loop => $facets, + displayFacetCount=> C4::Context->preference('displayFacetCount')||0, scan => $scan, search_error => $error, );