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

(-)a/C4/Search.pm (-3 / +5 lines)
Lines 1187-1193 sub parseQuery { Link Here
1187
            next unless $operands[$ii];
1187
            next unless $operands[$ii];
1188
            $query .= $operators[ $ii - 1 ] eq 'or' ? ' || ' : ' && '
1188
            $query .= $operators[ $ii - 1 ] eq 'or' ? ' || ' : ' && '
1189
              if ($query);
1189
              if ($query);
1190
            if ( $indexes[$ii] =~ m/su-/ ) {
1190
            if ( $operands[$ii] =~ /^[^"]\W*[-|_\w]*:\w.*[^"]$/ ) {
1191
                $query .= $operands[$ii];
1192
            }
1193
            elsif ( $indexes[$ii] =~ m/su-/ ) {
1191
                $query .= $indexes[$ii] . '(' . $operands[$ii] . ')';
1194
                $query .= $indexes[$ii] . '(' . $operands[$ii] . ')';
1192
            }
1195
            }
1193
            else {
1196
            else {
Lines 1280-1286 sub buildQuery { Link Here
1280
1283
1281
    my $cclq       = 0;
1284
    my $cclq       = 0;
1282
    my $cclindexes = getIndexes();
1285
    my $cclindexes = getIndexes();
1283
    if ( $query !~ /\s*ccl=/ ) {
1286
    if ( $query !~ /\s*(ccl=|pqf=|cql=)/ ) {
1284
        while ( !$cclq && $query =~ /(?:^|\W)([\w-]+)(,[\w-]+)*[:=]/g ) {
1287
        while ( !$cclq && $query =~ /(?:^|\W)([\w-]+)(,[\w-]+)*[:=]/g ) {
1285
            my $dx = lc($1);
1288
            my $dx = lc($1);
1286
            $cclq = grep { lc($_) eq $dx } @$cclindexes;
1289
            $cclq = grep { lc($_) eq $dx } @$cclindexes;
1287
- 

Return to bug 10688