FYI, I believe I have very similar changes coming in a big patch bomb for granular permissions in Cataloging/Authorities. You should say that from me soon (today).
--Joe On Tue, May 12, 2009 at 3:30 AM, Chris Cormack <[email protected]>wrote: > --- > opac/opac-authorities-home.pl | 1 + > opac/opac-search.pl | 23 ++++++++++++++++------- > 2 files changed, 17 insertions(+), 7 deletions(-) > > diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl > index b1674f1..f06965d 100755 > --- a/opac/opac-authorities-home.pl > +++ b/opac/opac-authorities-home.pl > @@ -83,6 +83,7 @@ if ( $op eq "do_search" ) { > # multi page display gestion > my $displaynext = 0; > my $displayprev = $startfrom; > + $total ||= 0; > if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) { > $displaynext = 1; > } > diff --git a/opac/opac-search.pl b/opac/opac-search.pl > index c2e9250..029ef1e 100755 > --- a/opac/opac-search.pl > +++ b/opac/opac-search.pl > @@ -3,6 +3,7 @@ > # Mostly copied from search.pl, see POD there > use strict; # always use > use warnings; > + > ## STEP 1. Load things that are used in both search page and > # results page and decide which template to load, operations > # to perform, etc. > @@ -180,7 +181,7 @@ if (!$advanced_search_types or $advanced_search_types > eq 'itemtypes') { > # $template->param(itypeloop=>\...@itype_loop,); > > # The following should only be loaded if we're bringing up the advanced > search template > -if ( $template_type eq 'advsearch' ) { > +if ( $template_type && $template_type eq 'advsearch' ) { > > # load the servers (used for searching -- to do federated searching, > etc.) > my $primary_servers_loop;# = displayPrimaryServers(); > @@ -281,7 +282,8 @@ my @operators; > > # indexes are query qualifiers, like 'title', 'author', etc. They > # can be single or multiple parameters separated by comma: > kw,right-Truncation > -my @indexes = exists($params->{'idx'}) ? split("\0",$params->{'idx'}) : > (); > +my @indexes; > +...@indexes = split("\0",$params->{'idx'}) if $params->{'idx'}; > > # if a simple index (only one) display the index used in the top search > box > if ($indexes[0] && !$indexes[1]) { > @@ -442,9 +444,12 @@ for (my $i=0;$i<=...@servers;$i++) { > } > } > foreach (@newresults) { > - $_->{coins} = GetCOinSBiblio($_->{'biblionumber'}); > + $_->{coins} = GetCOinSBiblio($_->{'biblionumber'}); > } > - $total = $total + $results_hashref->{$server}->{"hits"} if > $results_hashref->{$server}->{"hits"}; > + } > + if ($results_hashref->{$server}->{"hits"}){ > + $total = $total + $results_hashref->{$server}->{"hits"}; > + } > ## If there's just one result, redirect to the detail page > if ($total == 1) { > my $biblionumber=$newresults[0]->{biblionumber}; > @@ -607,9 +612,13 @@ if ( C4::Context->preference("kohaspsuggest") ) { > # VI. BUILD THE TEMPLATE > # NOTE: not using application/atom+xml or application/rss+xml beccause of > Internet Explorer 6; > # see bug 2078. > -my $content_type = ($cgi->param('format') && $cgi->param('format') =~ > /rss|atom/) ? "application/xml" : > - "text/html"; > - > +my $content_type; > +if ($cgi->param('format') && $cgi->param('format') =~ /rss|atom/ ){ > + $content_type = "application/xml"; > +} > +else { > + $content_type = "text/html"; > +} > # Build drop-down list for 'Add To:' menu... > my $session = get_session($cgi->cookie("CGISESSID")); > my @addpubshelves; > -- > 1.5.6.3 > > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha.org/mailman/listinfo/koha-patches > -- Joe Atzberger LibLime - Open Source Library Solutions
_______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
