-
-
- [% IF ( query_error ) %]
-
-
-
-
-
Error:
-
[% query_error | html %]
-
-
-
-
- [% END %]
-
-
-
- [% IF ( opacfacets && total ) %]
-
-
-
- [% INCLUDE 'opac-facets.inc' %]
-
-
-
-
- [% ELSE %]
-
- [% END %]
-
-
- [% IF ( total ) %]
- [% IF ( scan ) %]
-
Scan index:
-
-
-
- [% ELSE %]
-
-
- [% END # / IF scan %]
- [% INCLUDE 'page-numbers.inc' %]
- [% END # / IF total %]
-
- [% IF Koha.Preference( 'suggestion' ) == 1 && ( Koha.Preference( 'AnonSuggestions' ) == 1 || loggedinusername || Koha.Preference( 'ILLModule' ) == 1 ) %]
-
- Not finding what you're looking for?
-
-
- [% END %]
-
-
-
-
-
-
-
-[% INCLUDE 'opac-bottom.inc' %]
-[% BLOCK jsinclude %]
-
-[% END %]
--- a/misc/bin/koha-pazpar2-ctl.sh
+++ a/misc/bin/koha-pazpar2-ctl.sh
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# 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 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with Koha; if not, see
.
-
-### BEGIN INIT INFO
-# Provides: koha-pazpar-daemon
-# Required-Start: $syslog $remote_fs
-# Required-Stop: $syslog $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: PazPar2 server daemon for Koha
-### END INIT INFO
-
-USER=__KOHA_USER__
-GROUP=__KOHA_GROUP__
-DBNAME=__DB_NAME__
-NAME=koha-pazpar2-ctl.$DBNAME
-LOGDIR=__LOG_DIR__
-ERRLOG=$LOGDIR/koha-pazpar2daemon.err
-STDOUT=$LOGDIR/koha-pazpar2daemon.log
-OUTPUT=$LOGDIR/koha-pazpar2daemon-output.log
-PAZPAR2_CONF=__PAZPAR2_CONF_DIR__/pazpar2.xml
-PAZPAR2SRV=/usr/sbin/pazpar2
-
-test -f $PAZPAR2SRV || exit 0
-
-OTHERUSER=''
-if [[ $EUID -eq 0 ]]; then
- OTHERUSER="--user=$USER.$GROUP"
-fi
-
-case "$1" in
- start)
- echo "Starting PazPar2 Server"
- daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER -- $PAZPAR2SRV -f $PAZPAR2_CONF
- ;;
- stop)
- echo "Stopping PazPar2 Server"
- daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 --stop -- $PAZPAR2SRV -f $PAZPAR2_CONF
- ;;
- restart)
- echo "Restarting the PazPar2 Server"
- daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 --restart -- $PAZPAR2SRV -f $PAZPAR2_CONF
- ;;
- *)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart}"
- exit 1
- ;;
-esac
--- a/misc/koha-install-log
+++ a/misc/koha-install-log
@@ -37,7 +37,6 @@ OPAC_WWW_DIR=__OPAC_WWW_DIR__
PERL_MODULE_DIR=__PERL_MODULE_DIR__
KOHA_CONF_DIR=__KOHA_CONF_DIR__
ZEBRA_CONF_DIR=__ZEBRA_CONF_DIR__
-PAZPAR2_CONF_DIR=__PAZPAR2_CONF_DIR__
MISC_DIR=__MISC_DIR__
SCRIPT_DIR=__SCRIPT_DIR__
MAN_DIR=__MAN_DIR__
@@ -51,15 +50,10 @@ ZEBRA_AUTH_CFG=__ZEBRA_AUTH_CFG__
ZEBRA_BIB_CFG=__ZEBRA_BIB_CFG__
AUTH_RETRIEVAL_CFG=__AUTH_RETRIEVAL_CFG__
BIB_RETRIEVAL_CFG=__BIB_RETRIEVAL_CFG__
-MERGE_SERVER_HOST=__MERGE_SERVER_HOST__
-MERGE_SERVER_PORT=__MERGE_SERVER_PORT__
-PAZPAR2_HOST=__PAZPAR2_HOST__
-PAZPAR2_PORT=__PAZPAR2_PORT__
INSTALL_MODE=__INSTALL_MODE__
INSTALL_BASE=__INSTALL_BASE__
INSTALL_ZEBRA=__INSTALL_ZEBRA__
INSTALL_SRU=__INSTALL_SRU__
-INSTALL_PAZPAR2=__INSTALL_PAZPAR2__
ZEBRA_TOKENIZER=__ZEBRA_TOKENIZER__
RUN_DATABASE_TESTS=__RUN_DATABASE_TESTS__
PATH_TO_ZEBRA=__PATH_TO_ZEBRA__
--- a/opac/opac-search.pl
+++ a/opac/opac-search.pl
@@ -101,13 +101,9 @@ my @params = $cgi->multi_param("limit");
my @searchCategories = $cgi->multi_param('searchcat');
my $format = $cgi->param("format") || '';
-my $build_grouped_results = C4::Context->preference('OPACGroupResults');
if ($format =~ /(rss|atom|opensearchdescription)/) {
$template_name = 'opac-opensearch.tt';
}
-elsif (@params && $build_grouped_results) {
- $template_name = 'opac-results-grouped.tt';
-}
elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) || @searchCategories ) {
$template_name = 'opac-results.tt';
}
@@ -618,10 +614,6 @@ if ($tag) {
# FIXME: Because search and standard search don't work together OpacHiddenItems
# displays search results which should be hidden.
# FIXME: No facets for tags search.
-} elsif ($build_grouped_results) {
- eval {
- ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,undef,$query_type,$scan);
- };
} else {
$pasarParams .= '&query=' . uri_escape_utf8($query);
$pasarParams .= '&count=' . uri_escape_utf8($results_per_page);
@@ -667,20 +659,8 @@ for (my $i=0;$i<@servers;$i++) {
if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
$hits = $results_hashref->{$server}->{"hits"};
my $page = $cgi->param('page') || 0;
- my @newresults;
- if ($build_grouped_results) {
- foreach my $group (@{ $results_hashref->{$server}->{"GROUPS"} }) {
- # because pazGetRecords handles retieving only the records
- # we want as specified by $offset and $results_per_page,
- # we need to set the offset parameter of searchResults to 0
- my @group_results = searchResults( $search_context, $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
- $group->{"RECORDS"}, $variables);
- push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
- }
- } else {
- @newresults = searchResults( $search_context, $query_desc, $hits, $results_per_page, $offset, $scan,
+ my @newresults = searchResults( $search_context, $query_desc, $hits, $results_per_page, $offset, $scan,
$results_hashref->{$server}->{"RECORDS"}, $variables);
- }
$hits = 0 unless @newresults;
my $art_req_itypes;
@@ -799,23 +779,20 @@ for (my $i=0;$i<@servers;$i++) {
exit;
}
if ($hits) {
- if ( !$build_grouped_results ) {
- # We build the encrypted list of first OPACnumSearchResults biblios to pass with the search criteria for paging on opac-detail
- $pasarParams .= '&listBiblios=';
- my $j = 0;
- foreach (@newresults) {
- my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;
- $pasarParams .= uri_escape_utf8($bibnum) . ',';
- $j++;
- last if ($j == $results_per_page);
- }
- chop $pasarParams if ($pasarParams =~ /,$/);
- $pasarParams .= '&total=' . uri_escape_utf8( int($total) ) if ($pasarParams !~ /total=(?:[0-9]+)?/);
- if ($pasarParams) {
- my $session = get_session($cgi->cookie("CGISESSID"));
- $session->param('busc' => $pasarParams);
- }
- #
+ # We build the encrypted list of first OPACnumSearchResults biblios to pass with the search criteria for paging on opac-detail
+ $pasarParams .= '&listBiblios=';
+ my $j = 0;
+ foreach (@newresults) {
+ my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;
+ $pasarParams .= uri_escape_utf8($bibnum) . ',';
+ $j++;
+ last if ($j == $results_per_page);
+ }
+ chop $pasarParams if ($pasarParams =~ /,$/);
+ $pasarParams .= '&total=' . uri_escape_utf8( int($total) ) if ($pasarParams !~ /total=(?:[0-9]+)?/);
+ if ($pasarParams) {
+ my $session = get_session($cgi->cookie("CGISESSID"));
+ $session->param('busc' => $pasarParams);
}
$template->param(total => $hits);
my $limit_cgi_not_availablity = $limit_cgi;
--- a/rewrite-config.PL
+++ a/rewrite-config.PL
@@ -121,7 +121,6 @@ my %configuration = (
'__PERL_MODULE_DIR__' => ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
'__KOHA_CONF_DIR__' => "$prefix/etc/koha",
'__ZEBRA_CONF_DIR__' => "$prefix/etc/koha/zebradb",
- '__PAZPAR2_CONF_DIR__' => "$prefix/etc/koha/pazpar2",
'__MISC_DIR__' => "$prefix/misc",
'__SCRIPT_DIR__' => "$prefix/bin",
'__SCRIPT_NONDEV_DIR__' => "$prefix/bin",
@@ -140,15 +139,9 @@ my %configuration = (
'__ZEBRA_AUTH_CFG__' => 'zebra-authorities-dom.cfg',
'__ZEBRA_BIB_CFG__' => 'zebra-biblios-dom.cfg',
"__MERGE_SERVER_HOST__" => $myhost,
- "__MERGE_SERVER_PORT__" => '11001',
- "__PAZPAR2_HOST__" => $myhost,
- "__PAZPAR2_PORT__" => '11002',
"__INSTALL_MODE__" => 'standard',
"__INSTALL_BASE__" => '/usr/share/koha',
"__INSTALL_SRU__" => 'yes',
- "__INSTALL_PAZPAR2__" => 'no',
- "__PAZPAR2_TOGGLE_XML_PRE__" => '',
"__RUN_DATABASE_TESTS__" => 'no',
"__PATH_TO_ZEBRA__" => "",
"__USE_MEMCACHED__" => 'yes',
@@ -175,13 +168,6 @@ foreach my $key (keys %configuration) {
}
}
-# munge commenting out the PazPar2 mergeserver
-# entry in koha-conf.xml if necessary
-if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {
- $configuration{'__PAZPAR2_TOGGLE_XML_PRE__'} = '';
- $configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';
-}
-
my $fname = $ARGV[0];
my $file = &read_file($fname);
$file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;
--- a/t/db_dependent/UsageStats.t
+++ a/t/db_dependent/UsageStats.t
@@ -553,7 +553,6 @@ sub mocking_systempreferences_to_a_set_value {
TalkingTechItivaPhoneNotification
uppercasesurnames
IncludeSeeFromInSearches
- OpacGroupResults
QueryAutoTruncate
QueryFuzzy
QueryStemming
--