Lines 1312-1328
sub buildQuery {
Link Here
|
1312 |
if ( @limits ) { |
1312 |
if ( @limits ) { |
1313 |
$q .= ' and '.join(' and ', @limits); |
1313 |
$q .= ' and '.join(' and ', @limits); |
1314 |
} |
1314 |
} |
1315 |
return ( undef, $q, $q, "q=ccl=".uri_escape($q), $q, '', '', '', '', 'ccl' ); |
1315 |
return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' ); |
1316 |
} |
1316 |
} |
1317 |
if ( $query =~ /^cql=/ ) { |
1317 |
if ( $query =~ /^cql=/ ) { |
1318 |
return ( undef, $', $', "q=cql=".uri_escape($'), $', '', '', '', '', 'cql' ); |
1318 |
return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' ); |
1319 |
} |
1319 |
} |
1320 |
if ( $query =~ /^pqf=/ ) { |
1320 |
if ( $query =~ /^pqf=/ ) { |
1321 |
if ($query_desc) { |
1321 |
if ($query_desc) { |
1322 |
$query_cgi = "q=".uri_escape($query_desc); |
1322 |
$query_cgi = "q=".uri_escape_utf8($query_desc); |
1323 |
} else { |
1323 |
} else { |
1324 |
$query_desc = $'; |
1324 |
$query_desc = $'; |
1325 |
$query_cgi = "q=pqf=".uri_escape($'); |
1325 |
$query_cgi = "q=pqf=".uri_escape_utf8($'); |
1326 |
} |
1326 |
} |
1327 |
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); |
1327 |
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); |
1328 |
} |
1328 |
} |
Lines 1533-1539
sub buildQuery {
Link Here
|
1533 |
$group_OR_limits{$k} .= " or " if $group_OR_limits{$k}; |
1533 |
$group_OR_limits{$k} .= " or " if $group_OR_limits{$k}; |
1534 |
$limit_desc .= " or " if $group_OR_limits{$k}; |
1534 |
$limit_desc .= " or " if $group_OR_limits{$k}; |
1535 |
$group_OR_limits{$k} .= "$this_limit"; |
1535 |
$group_OR_limits{$k} .= "$this_limit"; |
1536 |
$limit_cgi .= "&limit=" . uri_escape($this_limit); |
1536 |
$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit); |
1537 |
$limit_desc .= " $this_limit"; |
1537 |
$limit_desc .= " $this_limit"; |
1538 |
} |
1538 |
} |
1539 |
|
1539 |
|
Lines 1541-1547
sub buildQuery {
Link Here
|
1541 |
else { |
1541 |
else { |
1542 |
$limit .= " and " if $limit || $query; |
1542 |
$limit .= " and " if $limit || $query; |
1543 |
$limit .= "$this_limit"; |
1543 |
$limit .= "$this_limit"; |
1544 |
$limit_cgi .= "&limit=" . uri_escape($this_limit); |
1544 |
$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit); |
1545 |
if ($this_limit =~ /^branch:(.+)/) { |
1545 |
if ($this_limit =~ /^branch:(.+)/) { |
1546 |
my $branchcode = $1; |
1546 |
my $branchcode = $1; |
1547 |
my $branchname = GetBranchName($branchcode); |
1547 |
my $branchname = GetBranchName($branchcode); |
Lines 1627-1635
sub _build_initial_query {
Link Here
|
1627 |
#e.g. " and kw,wrdl:test" |
1627 |
#e.g. " and kw,wrdl:test" |
1628 |
$params->{query} .= $operator . $operand; |
1628 |
$params->{query} .= $operator . $operand; |
1629 |
|
1629 |
|
1630 |
$params->{query_cgi} .= "&op=".uri_escape($operator) if $operator; |
1630 |
$params->{query_cgi} .= "&op=".uri_escape_utf8($operator) if $operator; |
1631 |
$params->{query_cgi} .= "&idx=".uri_escape($params->{index}) if $params->{index}; |
1631 |
$params->{query_cgi} .= "&idx=".uri_escape_utf8($params->{index}) if $params->{index}; |
1632 |
$params->{query_cgi} .= "&q=".uri_escape($params->{original_operand}) if $params->{original_operand}; |
1632 |
$params->{query_cgi} .= "&q=".uri_escape_utf8($params->{original_operand}) if $params->{original_operand}; |
1633 |
|
1633 |
|
1634 |
#e.g. " and kw,wrdl: test" |
1634 |
#e.g. " and kw,wrdl: test" |
1635 |
$params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand}; |
1635 |
$params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand}; |