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

(-)a/C4/Search.pm (-3 / +3 lines)
Lines 1808-1816 sub _build_initial_query { Link Here
1808
    #e.g. " and kw,wrdl:test"
1808
    #e.g. " and kw,wrdl:test"
1809
    $params->{query} .= $operator . $operand;
1809
    $params->{query} .= $operator . $operand;
1810
1810
1811
    $params->{query_cgi} .= "&op=".uri_escape_utf8($operator) if $operator;
1811
    $params->{query_cgi} .= "&op=".uri_escape_utf8($operator) if $operator;
1812
    $params->{query_cgi} .= "&idx=".uri_escape_utf8($params->{index}) if $params->{index};
1812
    $params->{query_cgi} .= "&idx=".uri_escape_utf8($params->{index}) if $params->{index};
1813
    $params->{query_cgi} .= "&q=".uri_escape_utf8($params->{original_operand}) if $params->{original_operand};
1813
    $params->{query_cgi} .= "&q=".uri_escape_utf8($params->{original_operand}) if $params->{original_operand};
1814
1814
1815
    #e.g. " and kw,wrdl: test"
1815
    #e.g. " and kw,wrdl: test"
1816
    $params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand};
1816
    $params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand};
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt (-1 / +1 lines)
Lines 23-29 Link Here
23
      xmlns:atom="http://www.w3.org/2005/Atom">
23
      xmlns:atom="http://www.w3.org/2005/Atom">
24
   <channel>
24
   <channel>
25
     <title><![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]></title>
25
     <title><![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]></title>
26
     <link href=[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss</link>
26
     <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss</link>
27
     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;sort_by=[% sort_by | uri %]&amp;format=atom"/>
27
     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;sort_by=[% sort_by | uri %]&amp;format=atom"/>
28
     <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] at [% LibraryName | html %]]]></description>
28
     <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] at [% LibraryName | html %]]]></description>
29
     <opensearch:totalResults>[% total | html %]</opensearch:totalResults>
29
     <opensearch:totalResults>[% total | html %]</opensearch:totalResults>
(-)a/opac/opac-search.pl (-4 / +3 lines)
Lines 570-576 unless ( $cgi->param('advsearch') ) { Link Here
570
sub _input_cgi_parse {
570
sub _input_cgi_parse {
571
    my @elements;
571
    my @elements;
572
    my $query_cgi = shift or return @elements;
572
    my $query_cgi = shift or return @elements;
573
    for my $this_cgi ( split('&',$query_cgi) ) {
573
    for my $this_cgi ( split('&amp;',$query_cgi) ) {
574
        next unless $this_cgi;
574
        next unless $this_cgi;
575
        $this_cgi =~ /(.*?)=(.*)/;
575
        $this_cgi =~ /(.*?)=(.*)/;
576
        push @elements, { input_name => $1, input_value => Encode::decode_utf8( uri_unescape($2) ) };
576
        push @elements, { input_name => $1, input_value => Encode::decode_utf8( uri_unescape($2) ) };
Lines 608-614 my $results_hashref; Link Here
608
my @coins;
608
my @coins;
609
609
610
if ($tag) {
610
if ($tag) {
611
    $query_cgi = "tag=" .  uri_escape_utf8( $tag ) . "&" . $query_cgi;
611
    $query_cgi = "tag=" .  uri_escape_utf8( $tag ) . "&amp;" . $query_cgi;
612
    my $taglist = get_tags({term=>$tag, approved=>1});
612
    my $taglist = get_tags({term=>$tag, approved=>1});
613
    $results_hashref->{biblioserver}->{hits} = scalar (@$taglist);
613
    $results_hashref->{biblioserver}->{hits} = scalar (@$taglist);
614
    my @marclist = map { C4::Biblio::GetXmlBiblio( $_->{biblionumber} ) } @$taglist;
614
    my @marclist = map { C4::Biblio::GetXmlBiblio( $_->{biblionumber} ) } @$taglist;
Lines 745-751 for (my $i=0;$i<@servers;$i++) { Link Here
745
                my $path_info = $cgi->url(-path_info=>1);
745
                my $path_info = $cgi->url(-path_info=>1);
746
                my $query_cgi_history = $cgi->url(-query=>1);
746
                my $query_cgi_history = $cgi->url(-query=>1);
747
                $query_cgi_history =~ s/^$path_info\?//;
747
                $query_cgi_history =~ s/^$path_info\?//;
748
                $query_cgi_history =~ s/;/&/g;
748
                $query_cgi_history =~ s/;/&amp;/g;
749
                my $query_desc_history = join ", ", grep { defined $_ } $query_desc, $limit_desc;
749
                my $query_desc_history = join ", ", grep { defined $_ } $query_desc, $limit_desc;
750
750
751
                unless ( $borrowernumber ) {
751
                unless ( $borrowernumber ) {
752
- 

Return to bug 16111