X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_cql2ccl.c;h=ecb9be6970a2c9dafbc15585a3e28d558e1319fc;hp=482e47a82eb604a3c863e4a375201b14a02437c3;hb=5ef9ca5de57e415b34c21fe0d17a79f7b8e6b636;hpb=871f1239cc0c8a2d4b2bd16a918a39c97633faa8 diff --git a/test/test_cql2ccl.c b/test/test_cql2ccl.c index 482e47a..ecb9be6 100644 --- a/test/test_cql2ccl.c +++ b/test/test_cql2ccl.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ #if HAVE_CONFIG_H @@ -18,7 +18,7 @@ static int tst_query_s(const char *cql, const char *expected_ccl, int ret = 1; CQL_parser cp = cql_parser_create(); int r = cql_parser_string(cp, cql); - + if (r) { yaz_log(YLOG_WARN, "cql: parse error: %s", cql); @@ -52,7 +52,7 @@ static int tst_query_s(const char *cql, const char *expected_ccl, yaz_log(YLOG_WARN, " got error"); } wrbuf_rewind(w); - r = cql_sortby_to_sortkeys(cql_parser_result(cp), + r = cql_sortby_to_sortkeys(cql_parser_result(cp), wrbuf_vp_puts, w); if (expected_keys && !r && !strcmp(wrbuf_cstr(w), expected_keys)) ; @@ -141,12 +141,14 @@ static void tst(void) YAZ_CHECK(tst_query("title = \"x y\"", "title=\"x y\"")); YAZ_CHECK(tst_query("title = x y", "title=\"x\" \"y\"")); + YAZ_CHECK(tst_query("title = x y z", "title=\"x\" \"y\" \"z\"")); + YAZ_CHECK(tst_query("dc.title=encyclopedia prox dinosaurs", "(dc.title=\"encyclopedia\") % (\"dinosaurs\")")); YAZ_CHECK(tst_query("dc.title=encyclopedia prox/distance<=3 dinosaurs", "(dc.title=\"encyclopedia\") %3 (\"dinosaurs\")")); YAZ_CHECK(tst_query("dc.title=encyclopedia prox/distance<=3/unit=word " - "dinosaurs", + "dinosaurs", "(dc.title=\"encyclopedia\") %3 (\"dinosaurs\")")); YAZ_CHECK(tst_query("dc.title=encyclopedia prox/distance<=3/unit=phrase " "dinosaurs", 0)); @@ -178,6 +180,8 @@ static void tst(void) "title,,1,0,lowValue")); YAZ_CHECK(tst_query_s("a sortby title/missingHigh", "\"a\"", "title,,1,0,highValue")); + YAZ_CHECK(tst_query_s("a sortby title/sort.missingHigh", "\"a\"", + "title,,1,0,highValue")); YAZ_CHECK(tst_query_s("a sortby title/bogus", "\"a\"", 0)); YAZ_CHECK(tst_query_s("a sortby dc.year dc.author", "\"a\"",