to allow facets with '&' character.
Signed-off-by: sonia bouis <sonia.bouis@univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
$group_OR_limits{$k} .= " or " if $group_OR_limits{$k};
$limit_desc .= " or " if $group_OR_limits{$k};
$group_OR_limits{$k} .= "$this_limit";
- $limit_cgi .= "&limit=$this_limit";
+ $limit_cgi .= "&limit=" . uri_escape($this_limit);
$limit_desc .= " $this_limit";
}
else {
$limit .= " and " if $limit || $query;
$limit .= "$this_limit";
- $limit_cgi .= "&limit=$this_limit";
+ $limit_cgi .= "&limit=" . uri_escape($this_limit);
if ($this_limit =~ /^branch:(.+)/) {
my $branchcode = $1;
my $branchname = GetBranchName($branchcode);
use C4::Branch; # GetBranches
use C4::Search::History;
+use URI::Escape;
+
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
# create a new CGI object
# FIXME: no_undef_params needs to be tested
my $input_name = $1;
my $input_value = $2;
$input_name =~ s/=$//;
- push @limit_inputs, { input_name => $input_name, input_value => $input_value };
+ push @limit_inputs, { input_name => $input_name, input_value => uri_unescape($input_value) };
}
$template->param ( LIMIT_INPUTS => \@limit_inputs );
[% IF ( sort_by ) %]
[% SET url = url _ "&sort_by=" _ sort_by %]
[% END %]
+ [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
[% IF facet.active %]
[% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
<span class="facet-label">[% facet.facet_label_value %]</span>
- [<a href="[% url |url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
+ [<a href="[% url %]" title="Remove facet [% facet.facet_title_value | html %]">x</a>]
[% ELSE %]
[% SET url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
- <span class="facet-label"><a href="[% url | url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
+ <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
[% IF ( displayFacetCount ) %]
<span class="facet-count"> ([% facet.facet_count %])</span>
[% END %]
[% IF ( sort_by ) %]
[% SET url = url _ "&sort_by=" _ sort_by |html %]
[% END %]
+ [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
[% IF facet.active %]
[% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
<span class="facet-label">[% facet.facet_label_value %]</span>
- [<a href="[% url |url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
+ [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
[% ELSE %]
[% SET url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
- <span class="facet-label"><a href="[% url | url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
+ <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
[% IF ( displayFacetCount ) %]
<span class="facet-count"> ([% facet.facet_count %])</span>
[% END %]
for my $this_cgi ( split('&',shift) ) {
next unless $this_cgi;
$this_cgi =~ /(.*?)=(.*)/;
- push @elements, { input_name => $1, input_value => $2 };
+ push @elements, { input_name => $1, input_value => uri_unescape($2) };
}
return @elements;
}