/* 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
#include <yaz/wrbuf.h>
#include <yaz/pquery.h>
-static int compare(cql_transform_t ct, const char *pqf, const char *cql)
+static int compare2(cql_transform_t ct, const char *pqf, const char *cql,
+ int expected_error)
{
int ret = 0;
ODR odr = odr_createmem(ODR_ENCODE);
WRBUF w = wrbuf_alloc();
Z_RPNQuery *q = p_query_rpn(odr, pqf);
-
+
if (q)
{
int r = cql_transform_rpn2cql_wrbuf(ct, w, q);
if (r != 0)
{
+ const char *addinfo = 0;
+ int err = cql_transform_error(ct, &addinfo);
/* transform error */
yaz_log(YLOG_LOG, "%s -> Error %d", pqf, r);
- if (!cql) /* also expected error? */
- ret = 1;
+ if (err == 0)
+ ;
+ else if (err == expected_error)
+ {
+ if (addinfo && cql && !strcmp(addinfo, cql))
+ ret = 1;
+ else if (!addinfo && !cql)
+ ret = 1;
+ }
}
else if (r == 0)
{
yaz_log(YLOG_LOG, "%s -> %s", pqf, wrbuf_cstr(w));
- if (cql && !strcmp(wrbuf_cstr(w), cql))
+ if (!expected_error)
+ ret = 1;
+ else if (cql && !strcmp(wrbuf_cstr(w), cql))
{
ret = 1;
}
+ else
+ {
+ yaz_log(YLOG_WARN, " expected: %s", cql ? cql : "null");
+ yaz_log(YLOG_WARN, " got: %s", wrbuf_cstr(w));
+ }
}
}
wrbuf_destroy(w);
return ret;
}
+static int compare(cql_transform_t ct, const char *pqf, const char *cql)
+{
+ return compare2(ct, pqf, cql, 0);
+}
+
static void tst1(void)
{
- cql_transform_t ct = cql_transform_create();
+ cql_transform_t ct = cql_transform_create();
YAZ_CHECK(compare(ct, "abc", "abc"));
YAZ_CHECK(compare(ct, "\"a b c\"", "\"a b c\""));
YAZ_CHECK(compare(ct, "@and a b", "a and b"));
+ YAZ_CHECK(compare(ct, "@or a @and b c", "a or (b and c)"));
+ YAZ_CHECK(compare(ct, "@or @and a b @and c d", "(a and b) or (c and d)"));
+ YAZ_CHECK(compare(ct, "@or @or a b @or c d", "(a or b) or (c or d)"));
+ YAZ_CHECK(compare(ct, "@and @and a b @and c d", "(a and b) and (c and d)"));
+
YAZ_CHECK(compare(ct, "@attr 1=field abc", "field=abc"));
- YAZ_CHECK(compare(ct, "@attr 1=4 abc", 0)); /* should fail */
+ YAZ_CHECK(compare2(ct, "@attr 1=4 abc", 0, 114)); /* should fail */
cql_transform_define_pattern(ct, "index.title", "1=4");
YAZ_CHECK(compare(ct, "@attr 1=4 abc", "title=abc"));
wrbuf_puts(w, "/");
}
wrbuf_puts(w, "../etc/pqf.properties");
-
+
ct = cql_transform_open_fname(wrbuf_cstr(w));
YAZ_CHECK(compare(ct, "@attr 1=4 abc", "dc.title=abc"));
YAZ_CHECK(compare(ct, "@attr 1=4 @attr 4=108 abc", "dc.title=/exact abc"));
YAZ_CHECK(compare(ct, "@attr 1=4 @attr 4=1 @attr 6=1 abc", "dc.title=abc"));
YAZ_CHECK(compare(ct, "@attr 1=1016 abc", "abc"));
/* Date tests */
- YAZ_CHECK(compare(ct, "@attr 2=1 @attr 1=30 1980", "dc.date<1980"));
- YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=3 1980", "dc.date=1980"));
- YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=5 1980", "dc.date>1980"));
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=1 1980", "dc.date<1980"));
YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=2 1980", "dc.date<=1980"));
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=3 1980", "dc.date=1980"));
YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=4 1980", "dc.date>=1980"));
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=5 1980", "dc.date>1980"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=4 234 @attr 1=30 @attr 2=2 1990", "dc.date>=234 and dc.date<=1990"));
+
/* Truncation */
YAZ_CHECK(compare(ct, "@attr 5=1 water", "water*"));
YAZ_CHECK(compare(ct, "@attr 5=2 water", "*water"));
YAZ_CHECK(compare(ct, "@attr 5=3 water", "*water*"));
+ YAZ_CHECK(compare(ct, "@attr 5=100 water", "water"));
+ YAZ_CHECK(compare(ct, "@attr 5=102 water", "water"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 water", "water"));
+
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat.*er", "wat*er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat?er", "wat*er"));
+
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat.er", "wat?er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat#er", "wat?er"));
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat?er", "wat\\?er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat*er", "wat\\*er"));
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat#er", "wat#er"));
+
+ /* \. is 'eaten' by PQF parser */
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat\\.er", "wat?er"));
+
+ /* Escape sequences */
+ /* note: escape sequences that survive after PQF parse below */
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat\\\\?er", "wat\\?er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat\\\\?er", "wat\\?er"));
+
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat\\\\*er", "wat\\*er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat\\\\*er", "wat\\*er"));
+
+ YAZ_CHECK(compare(ct, "wat\\\\#er", "wat#er"));
+ YAZ_CHECK(compare(ct, "@attr 5=100 wat\\\\#er", "wat#er"));
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat\\\\#er", "wat#er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat\\\\#er", "wat#er"));
+ YAZ_CHECK(compare(ct, "@attr 5=102 wat\\\\.er", "wat.er"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 wat\\\\.er", "wat.er"));
+
+ /* Quoting */
+ YAZ_CHECK(compare(ct, "@attr 5=100 \"\"", "\"\""));
+ YAZ_CHECK(compare(ct, "@attr 5=1 \"\"", "\"*\""));
+ YAZ_CHECK(compare(ct, "@attr 5=2 \"\"", "\"*\""));
+ YAZ_CHECK(compare(ct, "@attr 5=3 \"\"", "\"**\""));
+ YAZ_CHECK(compare(ct, "@attr 5=102 \"\"", "\"\""));
+ YAZ_CHECK(compare(ct, "@attr 5=104 \"\"", "\"\""));
+
+ YAZ_CHECK(compare(ct, "@attr 5=1 \"water basket\"", "\"water basket*\""));
+ YAZ_CHECK(compare(ct, "@attr 5=2 \"water basket\"", "\"*water basket\""));
+ YAZ_CHECK(compare(ct, "@attr 5=3 \"water basket\"", "\"*water basket*\""));
+
/* Other */
YAZ_CHECK(compare(ct, "@attr 2=103 @attr 1=_ALLRECORDS 1", "cql.allRecords=1"));
- YAZ_CHECK(compare(ct, "@attr 1=500 abc", 0));
+ YAZ_CHECK(compare2(ct, "@attr 1=500 abc", 0, 114));
+ YAZ_CHECK(compare2(ct, "@attr 5=99 x", "99", 120));
cql_transform_close(ct);
wrbuf_destroy(w);
}