X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_cql2ccl.c;h=b52ad145b9117fe280c49b6c9803beec0cdfe005;hp=c050f7e2a84c1e86c57247f62fd6ca07bf2f0f1e;hb=13ac77e545b5d7e8b5ecb053d0aaa321ce12e487;hpb=67263adf9c8efbd384b09ec71b98844ce7c7d2bf diff --git a/test/test_cql2ccl.c b/test/test_cql2ccl.c index c050f7e..b52ad14 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-2012 Index Data + * Copyright (C) 1995-2013 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)) ; @@ -148,7 +148,7 @@ static void tst(void) 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));