X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftst_rpn2cql.c;h=8867ac90ddba9b914da6509a37d2f6467d8e4f28;hp=2ef5d0e4ec82909a9bb31d226762e2bf7be4a14a;hb=6985b22c1da4a0c4d4182a6b0570df490a913403;hpb=b977948f73d07c0bf4478565f9af3497ffe862e7

diff --git a/test/tst_rpn2cql.c b/test/tst_rpn2cql.c
index 2ef5d0e..8867ac9 100644
--- a/test/tst_rpn2cql.c
+++ b/test/tst_rpn2cql.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
  */
 
@@ -34,7 +34,9 @@ static int compare(cql_transform_t ct, const char *pqf, const char *cql)
         {
             yaz_log(YLOG_LOG, "%s -> %s", pqf, wrbuf_cstr(w));
             if (cql && !strcmp(wrbuf_cstr(w), cql))
+            {
                 ret = 1;
+            }
         }
     }
     wrbuf_destroy(w);
@@ -42,25 +44,69 @@ static int compare(cql_transform_t ct, const char *pqf, const char *cql)
     return ret;
 }
 
-static void tst(void)
+static void tst1(void)
 {
     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, "@attr 1=field abc", "field=abc"));
+    YAZ_CHECK(compare(ct, "@attr 1=4 abc", 0)); /* should fail */
+
+    cql_transform_define_pattern(ct, "index.title", "1=4");
+    YAZ_CHECK(compare(ct, "@attr 1=4 abc", "title=abc"));
+
+    cql_transform_define_pattern(ct, "index.foo", "1=bar");
+    YAZ_CHECK(compare(ct, "@attr 1=bar abc", "foo=abc"));
+
+    cql_transform_close(ct);
+}
+
+static void tst2(void)
+{
+    WRBUF w = wrbuf_alloc();
+    cql_transform_t ct = 0;
+    const char *srcdir = getenv("srcdir");
+    if (srcdir)
+    {
+        wrbuf_puts(w, srcdir);
+        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 3=1 @attr 6=1 abc", "dc.title=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"));
+    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=2 1980", "dc.date<=1980"));
+    YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=4 1980", "dc.date>=1980"));
+
+    YAZ_CHECK(compare(ct, "@attr 2=103 @attr 1=_ALLRECORDS 1", "cql.allRecords=1"));
+    YAZ_CHECK(compare(ct, "@attr 1=500 abc", 0));
     cql_transform_close(ct);
+    wrbuf_destroy(w);
 }
 
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
     YAZ_CHECK_LOG();
-    tst();
+    tst1();
+    tst2();
     YAZ_CHECK_TERM;
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab