Lines 1306-1322
sub buildQuery {
Link Here
|
1306 |
if ( @limits ) { |
1306 |
if ( @limits ) { |
1307 |
$q .= ' and '.join(' and ', @limits); |
1307 |
$q .= ' and '.join(' and ', @limits); |
1308 |
} |
1308 |
} |
1309 |
return ( undef, $q, $q, "q=ccl=".uri_escape($q), $q, '', '', '', '', 'ccl' ); |
1309 |
return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' ); |
1310 |
} |
1310 |
} |
1311 |
if ( $query =~ /^cql=/ ) { |
1311 |
if ( $query =~ /^cql=/ ) { |
1312 |
return ( undef, $', $', "q=cql=".uri_escape($'), $', '', '', '', '', 'cql' ); |
1312 |
return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' ); |
1313 |
} |
1313 |
} |
1314 |
if ( $query =~ /^pqf=/ ) { |
1314 |
if ( $query =~ /^pqf=/ ) { |
1315 |
if ($query_desc) { |
1315 |
if ($query_desc) { |
1316 |
$query_cgi = "q=".uri_escape($query_desc); |
1316 |
$query_cgi = "q=".uri_escape_utf8($query_desc); |
1317 |
} else { |
1317 |
} else { |
1318 |
$query_desc = $'; |
1318 |
$query_desc = $'; |
1319 |
$query_cgi = "q=pqf=".uri_escape($'); |
1319 |
$query_cgi = "q=pqf=".uri_escape_utf8($'); |
1320 |
} |
1320 |
} |
1321 |
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); |
1321 |
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); |
1322 |
} |
1322 |
} |
Lines 1488-1496
sub buildQuery {
Link Here
|
1488 |
$query .= " $operators[$i-1] "; |
1488 |
$query .= " $operators[$i-1] "; |
1489 |
$query .= " $index_plus " unless $indexes_set; |
1489 |
$query .= " $index_plus " unless $indexes_set; |
1490 |
$query .= " $operand"; |
1490 |
$query .= " $operand"; |
1491 |
$query_cgi .= "&op=".uri_escape($operators[$i-1]); |
1491 |
$query_cgi .= "&op=".uri_escape_utf8($operators[$i-1]); |
1492 |
$query_cgi .= "&idx=".uri_escape($index) if $index; |
1492 |
$query_cgi .= "&idx=".uri_escape_utf8($index) if $index; |
1493 |
$query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i]; |
1493 |
$query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i]; |
1494 |
$query_desc .= |
1494 |
$query_desc .= |
1495 |
" $operators[$i-1] $index_plus $operands[$i]"; |
1495 |
" $operators[$i-1] $index_plus $operands[$i]"; |
1496 |
} |
1496 |
} |
Lines 1500-1507
sub buildQuery {
Link Here
|
1500 |
$query .= " and "; |
1500 |
$query .= " and "; |
1501 |
$query .= "$index_plus " unless $indexes_set; |
1501 |
$query .= "$index_plus " unless $indexes_set; |
1502 |
$query .= "$operand"; |
1502 |
$query .= "$operand"; |
1503 |
$query_cgi .= "&op=and&idx=".uri_escape($index) if $index; |
1503 |
$query_cgi .= "&op=and&idx=".uri_escape_utf8($index) if $index; |
1504 |
$query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i]; |
1504 |
$query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i]; |
1505 |
$query_desc .= " and $index_plus $operands[$i]"; |
1505 |
$query_desc .= " and $index_plus $operands[$i]"; |
1506 |
} |
1506 |
} |
1507 |
} |
1507 |
} |
Lines 1513-1520
sub buildQuery {
Link Here
|
1513 |
$query .= " $index_plus " unless $indexes_set; |
1513 |
$query .= " $index_plus " unless $indexes_set; |
1514 |
$query .= $operand; |
1514 |
$query .= $operand; |
1515 |
$query_desc .= " $index_plus $operands[$i]"; |
1515 |
$query_desc .= " $index_plus $operands[$i]"; |
1516 |
$query_cgi .= "&idx=".uri_escape($index) if $index; |
1516 |
$query_cgi .= "&idx=".uri_escape_utf8($index) if $index; |
1517 |
$query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i]; |
1517 |
$query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i]; |
1518 |
$previous_operand = 1; |
1518 |
$previous_operand = 1; |
1519 |
} |
1519 |
} |
1520 |
} #/if $operands |
1520 |
} #/if $operands |