X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstccl.c;h=f5aac606f4f1ed5c34a1c00011070870a813fa8e;hb=3bfe867a001cb4e4f88d47541f77a21027719bd5;hp=32c03290cf1448d5184108b1d7c042190e2dba73;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/test/tstccl.c b/test/tstccl.c
index 32c0329..f5aac60 100644
--- a/test/tstccl.c
+++ b/test/tstccl.c
@@ -2,13 +2,13 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstccl.c,v 1.12 2007-01-03 08:42:16 adam Exp $
+ * $Id: tstccl.c,v 1.15 2007-03-19 22:17:41 adam Exp $
  */
 
 /* CCL test */
 
 #include <string.h>
-#include <yaz/ccl.h>
+#include <yaz/ccl_xml.h>
 #include <yaz/test.h>
 
 
@@ -36,12 +36,12 @@ static int tst_ccl_query(CCL_bibset bibset,
             ccl_pquery(wrbuf, rpn);
             
             /* check expect a result and that it matches */
-            if (result && !strcmp(wrbuf_buf(wrbuf), result))
+            if (result && !strcmp(wrbuf_cstr(wrbuf), result))
                 ret = 1;
             else
                 ret = 0;
             ccl_rpn_delete(rpn);
-            wrbuf_free(wrbuf, 1);
+            wrbuf_destroy(wrbuf);
         }
         else 
         {
@@ -98,6 +98,45 @@ void tst1(int pass)
                      "x r=o\n"
             );
         break;
+    case 3:
+#if YAZ_HAVE_XML2
+        if (1)
+        {
+            xmlDocPtr doc;
+            int r;
+            const char *addinfo = 0;
+            const char *xml_str = 
+                "<cclmap>\n"
+                " <qual name=\"ti\">\n"
+                "   <attr type=\"u\" value=\"4\"/>\n"
+                "   <attr type=\"s\" value=\"pw\"/>\n"
+                "   <attr type=\"t\" value=\"l,r\"/>\n"
+                " </qual>\n"
+                " <qual name=\"term\">\n"
+                "   <attr type=\"1\" value=\"1016\"/>\n"
+                "   <attr type=\"s\" value=\"al,pw\"/>\n"
+                " </qual>\n"
+                " <qual name=\"dc.title\">\n"
+                "   <attr type=\"1\" value=\"/my/title\"/>\n"
+                " </qual>\n"
+                " <qual name=\"date\">\n"
+                "   <attr type=\"r\" value=\"r\"/>\n"
+                " </qual>\n"
+                " <qual name=\"x\">\n"
+                "   <attr type=\"r\" value=\"o\"/>\n"
+                " </qual>\n"
+                "</cclmap>\n";
+            
+            doc = xmlParseMemory(xml_str, strlen(xml_str));
+            YAZ_CHECK(doc);
+
+            r = ccl_xml_config(bibset, xmlDocGetRootElement(doc), &addinfo);
+            YAZ_CHECK_EQ(r, 0);
+        }
+        break;
+#else
+        return;
+#endif
     default:
         YAZ_CHECK(0);
         return;
@@ -169,9 +208,11 @@ void tst1(int pass)
 int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
     tst1(0);
     tst1(1);
     tst1(2);
+    tst1(3);
     YAZ_CHECK_TERM;
 }
 /*