Attachment #26023 for bug #11515

View | Details | Raw Unified | Return to bug 11515
Collapse All | Expand All

Lines 1026-1032 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-1 / +2 lines)
1026	<span>Previous</span>	1026	<span>Previous</span>
1027	[% END %]	1027	[% END %]
1028	</li>	1028	</li>
1029	<li class="back_results"><a href="opac-search.pl?[% busc \|url %]" title="Back to the results search list">Back to results</a></li>	1029	[%# busc is already URI encoded %]
		1030	<li class="back_results"><a href="opac-search.pl?[% busc %]" title="Back to the results search list">Back to results</a></li>
1030	<li class="right_results">	1031	<li class="right_results">
1031	[% IF ( next ) %]<a href="[% next %]" title="See: [% IF ( nextTitle ) %][% nextTitle \|html %][% ELSE %]next biblio[% END %]">Next »</a>	1032	[% IF ( next ) %]<a href="[% next %]" title="See: [% IF ( nextTitle ) %][% nextTitle \|html %][% ELSE %]next biblio[% END %]">Next »</a>
1032	[% ELSE %]	1033	[% ELSE %]

Lines 1417-1422 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (+1 lines)
1417	<div class="l_Results">[% IF ( listResults ) %]<a href="#" id="a_listResults" title="Show pagination list ([% indexPag %]-[% indexPagEnd %] / [% totalPag %])">Browse results</a>[% ELSE %]<span>Browse results</span>[% END %]</div>	1417	<div class="l_Results">[% IF ( listResults ) %]<a href="#" id="a_listResults" title="Show pagination list ([% indexPag %]-[% indexPagEnd %] / [% totalPag %])">Browse results</a>[% ELSE %]<span>Browse results</span>[% END %]</div>
1418	<ul class="pg_menu clearfix">	1418	<ul class="pg_menu clearfix">
1419	<li class="left_results">[% IF ( previous ) %]<a href="[% previous %]" title="See: [% IF ( previousTitle ) %][% previousTitle \|html %][% ELSE %]previous biblio[% END %]">« Previous</a>[% ELSE %]<span>Previous</span>[% END %]</li>	1419	<li class="left_results">[% IF ( previous ) %]<a href="[% previous %]" title="See: [% IF ( previousTitle ) %][% previousTitle \|html %][% ELSE %]previous biblio[% END %]">« Previous</a>[% ELSE %]<span>Previous</span>[% END %]</li>
		1420	[%# busc ise already URI encoded %]
1420	<li class="back_results"><a href="opac-search.pl?[% busc %]" title="Back to the results search list">Back to results</a></li>	1421	<li class="back_results"><a href="opac-search.pl?[% busc %]" title="Back to the results search list">Back to results</a></li>
1421	<li class="right_results">[% IF ( next ) %]<a href="[% next %]" title="See: [% IF ( nextTitle ) %][% nextTitle \|html %][% ELSE %]next biblio[% END %]">Next »</a>[% ELSE %]<span>Next</span>[% END %]</li>	1422	<li class="right_results">[% IF ( next ) %]<a href="[% next %]" title="See: [% IF ( nextTitle ) %][% nextTitle \|html %][% ELSE %]next biblio[% END %]">Next »</a>[% ELSE %]<span>Next</span>[% END %]</li>
1422	</ul>	1423	</ul>




my %paging = (previous => {}, next => {});
if ($session->param('busc')) {
    use C4::Search;
    use URI::Escape;

    # Rebuild the string to store on session
    # param value is URI encoded and params separator is HTML encode (&amp;)
    sub rebuildBuscParam
    {
        my $arrParamsBusc = shift;

            if ($_ =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|total|offset|offsetSearch|next|previous|count|expand|scan)/) {
                if (defined($arrParamsBusc->{$_})) {
                    $pasarParams .= '&amp;' if ($j);
                    $pasarParams .= $_ . '=' . uri_escape( $arrParamsBusc->{$_} );
                    $j++;
                }
            } else {
                for my $value (@{$arrParamsBusc->{$_}}) {
                    $pasarParams .= '&amp;' if ($j);
                    $pasarParams .= $_ . '=' . uri_escape($value);
                    $j++;
                }
            }

    for (@arrBusc) {
        ($key, $value) = split(/=/, $_, 2);
        if ($key =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|next|previous|total|offset|offsetSearch|count|expand|scan)/) {
            $arrParamsBusc{$key} = uri_unescape($value);
        } else {
            unless (exists($arrParamsBusc{$key})) {
                $arrParamsBusc{$key} = [];
            }
            push @{$arrParamsBusc{$key}}, uri_unescape($value);
        }
    }
    my $searchAgain = 0;

    for (@arrBusc) {
        unless ($_ =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|next|previous|total|count|offsetSearch)/) {
            $buscParam .= '&amp;' unless ($j == 0);
            $buscParam .= $_; # string already URI encoded
            $j++;
        }
    }






# String with params with the search criteria for the paging in opac-detail
# param value is URI encoded and params separator is HTML encode (&amp;)
my $pasarParams = '';
my $j = 0;
for (keys %$params) {
    my @pasarParam = $cgi->param($_);
    for my $paramValue(@pasarParam) {
        $pasarParams .= '&amp;' if ($j > 0);
        $pasarParams .= $_ . '=' . uri_escape($paramValue);
        $j++;
    }
}

        ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
    };
} else {
    $pasarParams .= '&amp;query=' . uri_escape($query);
    $pasarParams .= '&amp;count=' . uri_escape($results_per_page);
    $pasarParams .= '&amp;simple_query=' . uri_escape($simple_query);
    $pasarParams .= '&amp;query_type=' . uri_escape($query_type) if ($query_type);
    eval {
        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan,1);
    };

                my $j = 0;
                foreach (@newresults) {
                    my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;
                    $pasarParams .= uri_escape($bibnum) . ',';
                    $j++;
                    last if ($j == $results_per_page);
                }
                chop $pasarParams if ($pasarParams =~ /,$/);
                $pasarParams .= '&amp;total=' . uri_escape( int($total) ) if ($pasarParams !~ /total=(?:[0-9]+)?/);
                if ($pasarParams) {
                    my $session = get_session($cgi->cookie("CGISESSID"));
                    $session->param('busc' => $pasarParams);
- 

Return to bug 11515

Lines 121-128 my $session = get_session($query->cookie("CGISESSID")); Link Here

(-)a/opac/opac-detail.pl (-5 / +7 lines)
121	my %paging = (previous => {}, next => {});	121	my %paging = (previous => {}, next => {});
122	if ($session->param('busc')) {	122	if ($session->param('busc')) {
123	use C4::Search;	123	use C4::Search;
		124	use URI::Escape;
124		125
125	# Rebuild the string to store on session	126	# Rebuild the string to store on session
		127	# param value is URI encoded and params separator is HTML encode (&)
126	sub rebuildBuscParam	128	sub rebuildBuscParam
127	{	129	{
128	my $arrParamsBusc = shift;	130	my $arrParamsBusc = shift;
Lines 133-145 if ($session->param('busc')) { Link Here
133	if ($_ =~ /^(?:query\|listBiblios\|newlistBiblios\|query_type\|simple_query\|total\|offset\|offsetSearch\|next\|previous\|count\|expand\|scan)/) {	135	if ($_ =~ /^(?:query\|listBiblios\|newlistBiblios\|query_type\|simple_query\|total\|offset\|offsetSearch\|next\|previous\|count\|expand\|scan)/) {
134	if (defined($arrParamsBusc->{$_})) {	136	if (defined($arrParamsBusc->{$_})) {
135	$pasarParams .= '&' if ($j);	137	$pasarParams .= '&' if ($j);
136	$pasarParams .= $_ . '=' . $arrParamsBusc->{$_};	138	$pasarParams .= $_ . '=' . uri_escape( $arrParamsBusc->{$_} );
137	$j++;	139	$j++;
138	}	140	}
139	} else {	141	} else {
140	for my $value (@{$arrParamsBusc->{$_}}) {	142	for my $value (@{$arrParamsBusc->{$_}}) {
141	$pasarParams .= '&' if ($j);	143	$pasarParams .= '&' if ($j);
142	$pasarParams .= $_ . '=' . $value;	144	$pasarParams .= $_ . '=' . uri_escape($value);
143	$j++;	145	$j++;
144	}	146	}
145	}	147	}
Lines 201-212 if ($session->param('busc')) { Link Here
201	for (@arrBusc) {	203	for (@arrBusc) {
202	($key, $value) = split(/=/, $_, 2);	204	($key, $value) = split(/=/, $_, 2);
203	if ($key =~ /^(?:query\|listBiblios\|newlistBiblios\|query_type\|simple_query\|next\|previous\|total\|offset\|offsetSearch\|count\|expand\|scan)/) {	205	if ($key =~ /^(?:query\|listBiblios\|newlistBiblios\|query_type\|simple_query\|next\|previous\|total\|offset\|offsetSearch\|count\|expand\|scan)/) {
204	$arrParamsBusc{$key} = $value;	206	$arrParamsBusc{$key} = uri_unescape($value);
205	} else {	207	} else {
206	unless (exists($arrParamsBusc{$key})) {	208	unless (exists($arrParamsBusc{$key})) {
207	$arrParamsBusc{$key} = [];	209	$arrParamsBusc{$key} = [];
208	}	210	}
209	push @{$arrParamsBusc{$key}}, $value;	211	push @{$arrParamsBusc{$key}}, uri_unescape($value);
210	}	212	}
211	}	213	}
212	my $searchAgain = 0;	214	my $searchAgain = 0;
Lines 279-285 if ($session->param('busc')) { Link Here
279	for (@arrBusc) {	281	for (@arrBusc) {
280	unless ($_ =~ /^(?:query\|listBiblios\|newlistBiblios\|query_type\|simple_query\|next\|previous\|total\|count\|offsetSearch)/) {	282	unless ($_ =~ /^(?:query\|listBiblios\|newlistBiblios\|query_type\|simple_query\|next\|previous\|total\|count\|offsetSearch)/) {
281	$buscParam .= '&' unless ($j == 0);	283	$buscParam .= '&' unless ($j == 0);
282	$buscParam .= $_;	284	$buscParam .= $_; # string already URI encoded
283	$j++;	285	$j++;
284	}	286	}
285	}	287	}

Lines 330-342 $tag = $params->{tag} if $params->{tag}; Link Here

(-)a/opac/opac-search.pl (-8 / +8 lines)
330		330
331		331
332	# String with params with the search criteria for the paging in opac-detail	332	# String with params with the search criteria for the paging in opac-detail
		333	# param value is URI encoded and params separator is HTML encode (&)
333	my $pasarParams = '';	334	my $pasarParams = '';
334	my $j = 0;	335	my $j = 0;
335	for (keys %$params) {	336	for (keys %$params) {
336	my @pasarParam = $cgi->param($_);	337	my @pasarParam = $cgi->param($_);
337	for my $paramValue(@pasarParam) {	338	for my $paramValue(@pasarParam) {
338	$pasarParams .= '&' if ($j > 0);	339	$pasarParams .= '&' if ($j > 0);
339	$pasarParams .= $_ . '=' . $paramValue;	340	$pasarParams .= $_ . '=' . uri_escape($paramValue);
340	$j++;	341	$j++;
341	}	342	}
342	}	343	}
Lines 511-520 if ($tag) { Link Here
511	($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);	512	($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
512	};	513	};
513	} else {	514	} else {
514	$pasarParams .= '&query=' . $query;	515	$pasarParams .= '&query=' . uri_escape($query);
515	$pasarParams .= '&count=' . $results_per_page;	516	$pasarParams .= '&count=' . uri_escape($results_per_page);
516	$pasarParams .= '&simple_query=' . $simple_query;	517	$pasarParams .= '&simple_query=' . uri_escape($simple_query);
517	$pasarParams .= '&query_type=' . $query_type if ($query_type);	518	$pasarParams .= '&query_type=' . uri_escape($query_type) if ($query_type);
518	eval {	519	eval {
519	($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan,1);	520	($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan,1);
520	};	521	};
Lines 667-678 for (my $i=0;$i<@servers;$i++) { Link Here
667	my $j = 0;	668	my $j = 0;
668	foreach (@newresults) {	669	foreach (@newresults) {
669	my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;	670	my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;
670	$pasarParams .= $bibnum . ',';	671	$pasarParams .= uri_escape($bibnum) . ',';
671	$j++;	672	$j++;
672	last if ($j == $results_per_page);	673	last if ($j == $results_per_page);
673	}	674	}
674	chop $pasarParams if ($pasarParams =~ /,$/);	675	chop $pasarParams if ($pasarParams =~ /,$/);
675	$pasarParams .= '&total=' . int($total) if ($pasarParams !~ /total=(?:[0-9]+)?/);	676	$pasarParams .= '&total=' . uri_escape( int($total) ) if ($pasarParams !~ /total=(?:[0-9]+)?/);
676	if ($pasarParams) {	677	if ($pasarParams) {
677	my $session = get_session($cgi->cookie("CGISESSID"));	678	my $session = get_session($cgi->cookie("CGISESSID"));
678	$session->param('busc' => $pasarParams);	679	$session->param('busc' => $pasarParams);
679	-