X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_rpn2cql.c;h=fd0e5a64cc3f4803660bcee56a49e9ad500f5be3;hb=871f1239cc0c8a2d4b2bd16a918a39c97633faa8;hp=73f5f5f727aaacf52137098b891b0d746509dd9d;hpb=801004d08d99b46b34f9a1b2342b9a5c13337d95;p=yaz-moved-to-github.git

diff --git a/test/test_rpn2cql.c b/test/test_rpn2cql.c
index 73f5f5f..fd0e5a6 100644
--- a/test/test_rpn2cql.c
+++ b/test/test_rpn2cql.c
@@ -40,6 +40,11 @@ static int compare(cql_transform_t ct, const char *pqf, const char *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);
@@ -90,8 +95,54 @@ static void tst2(void)
     YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=5 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=4 1980", "dc.date>=1980"));
-    /* truncation tests */
-    YAZ_CHECK(compare(ct, "@attr 1=1016 @attr 5=r abc", "abc"));
+
+    /* 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));