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

(-)a/C4/Search.pm (-3 / +3 lines)
Lines 1451-1460 sub buildQuery { Link Here
1451
        if ( @limits ) {
1451
        if ( @limits ) {
1452
            $q .= ' and '.join(' and ', @limits);
1452
            $q .= ' and '.join(' and ', @limits);
1453
        }
1453
        }
1454
        return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' );
1454
        return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', 'ccl' );
1455
    }
1455
    }
1456
    if ( $query =~ /^cql=/ ) {
1456
    if ( $query =~ /^cql=/ ) {
1457
        return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' );
1457
        return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', 'cql' );
1458
    }
1458
    }
1459
    if ( $query =~ /^pqf=/ ) {
1459
    if ( $query =~ /^pqf=/ ) {
1460
        if ($query_desc) {
1460
        if ($query_desc) {
Lines 1463-1469 sub buildQuery { Link Here
1463
            $query_desc = $';
1463
            $query_desc = $';
1464
            $query_cgi = "q=pqf=".uri_escape_utf8($');
1464
            $query_cgi = "q=pqf=".uri_escape_utf8($');
1465
        }
1465
        }
1466
        return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' );
1466
        return ( undef, $', $', $query_cgi, $query_desc, '', '', '', 'pqf' );
1467
    }
1467
    }
1468
1468
1469
    # pass nested queries directly
1469
    # pass nested queries directly
(-)a/t/db_dependent/Search.t (-3 / +2 lines)
Lines 968-979 sub run_unimarc_search_tests { Link Here
968
}
968
}
969
969
970
subtest 'MARC21 + GRS-1' => sub {
970
subtest 'MARC21 + GRS-1' => sub {
971
    plan tests => 110;
971
    plan tests => 107;
972
    run_marc21_search_tests('grs1');
972
    run_marc21_search_tests('grs1');
973
};
973
};
974
974
975
subtest 'MARC21 + DOM' => sub {
975
subtest 'MARC21 + DOM' => sub {
976
    plan tests => 110;
976
    plan tests => 107;
977
    run_marc21_search_tests('dom');
977
    run_marc21_search_tests('dom');
978
};
978
};
979
979
980
- 

Return to bug 9819