Lines 1479-1495
sub buildQuery {
Link Here
|
1479 |
if ( @limits ) { |
1479 |
if ( @limits ) { |
1480 |
$q .= ' and '.join(' and ', @limits); |
1480 |
$q .= ' and '.join(' and ', @limits); |
1481 |
} |
1481 |
} |
1482 |
return ( undef, $q, $q, "q=ccl=".uri_escape($q), $q, '', '', '', '', 'ccl' ); |
1482 |
return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' ); |
1483 |
} |
1483 |
} |
1484 |
if ( $query =~ /^cql=/ ) { |
1484 |
if ( $query =~ /^cql=/ ) { |
1485 |
return ( undef, $', $', "q=cql=".uri_escape($'), $', '', '', '', '', 'cql' ); |
1485 |
return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' ); |
1486 |
} |
1486 |
} |
1487 |
if ( $query =~ /^pqf=/ ) { |
1487 |
if ( $query =~ /^pqf=/ ) { |
1488 |
if ($query_desc) { |
1488 |
if ($query_desc) { |
1489 |
$query_cgi = "q=".uri_escape($query_desc); |
1489 |
$query_cgi = "q=".uri_escape_utf8($query_desc); |
1490 |
} else { |
1490 |
} else { |
1491 |
$query_desc = $'; |
1491 |
$query_desc = $'; |
1492 |
$query_cgi = "q=pqf=".uri_escape($'); |
1492 |
$query_cgi = "q=pqf=".uri_escape_utf8($'); |
1493 |
} |
1493 |
} |
1494 |
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); |
1494 |
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); |
1495 |
} |
1495 |
} |
Lines 1711-1717
sub buildQuery {
Link Here
|
1711 |
$group_OR_limits{$k} .= " or " if $group_OR_limits{$k}; |
1711 |
$group_OR_limits{$k} .= " or " if $group_OR_limits{$k}; |
1712 |
$limit_desc .= " or " if $group_OR_limits{$k}; |
1712 |
$limit_desc .= " or " if $group_OR_limits{$k}; |
1713 |
$group_OR_limits{$k} .= "$this_limit"; |
1713 |
$group_OR_limits{$k} .= "$this_limit"; |
1714 |
$limit_cgi .= "&limit=" . uri_escape($this_limit); |
1714 |
$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit); |
1715 |
$limit_desc .= " $this_limit"; |
1715 |
$limit_desc .= " $this_limit"; |
1716 |
} |
1716 |
} |
1717 |
|
1717 |
|
Lines 1719-1725
sub buildQuery {
Link Here
|
1719 |
else { |
1719 |
else { |
1720 |
$limit .= " and " if $limit || $query; |
1720 |
$limit .= " and " if $limit || $query; |
1721 |
$limit .= "$this_limit"; |
1721 |
$limit .= "$this_limit"; |
1722 |
$limit_cgi .= "&limit=" . uri_escape($this_limit); |
1722 |
$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit); |
1723 |
if ($this_limit =~ /^branch:(.+)/) { |
1723 |
if ($this_limit =~ /^branch:(.+)/) { |
1724 |
my $branchcode = $1; |
1724 |
my $branchcode = $1; |
1725 |
my $branchname = GetBranchName($branchcode); |
1725 |
my $branchname = GetBranchName($branchcode); |
Lines 1809-1817
sub _build_initial_query {
Link Here
|
1809 |
#e.g. " and kw,wrdl:test" |
1809 |
#e.g. " and kw,wrdl:test" |
1810 |
$params->{query} .= $operator . $operand; |
1810 |
$params->{query} .= $operator . $operand; |
1811 |
|
1811 |
|
1812 |
$params->{query_cgi} .= "&op=".uri_escape($operator) if $operator; |
1812 |
$params->{query_cgi} .= "&op=".uri_escape_utf8($operator) if $operator; |
1813 |
$params->{query_cgi} .= "&idx=".uri_escape($params->{index}) if $params->{index}; |
1813 |
$params->{query_cgi} .= "&idx=".uri_escape_utf8($params->{index}) if $params->{index}; |
1814 |
$params->{query_cgi} .= "&q=".uri_escape($params->{original_operand}) if $params->{original_operand}; |
1814 |
$params->{query_cgi} .= "&q=".uri_escape_utf8($params->{original_operand}) if $params->{original_operand}; |
1815 |
|
1815 |
|
1816 |
#e.g. " and kw,wrdl: test" |
1816 |
#e.g. " and kw,wrdl: test" |
1817 |
$params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand}; |
1817 |
$params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand}; |