X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstccl.c;h=95975cc64ee9f6cb2605a5363202ed14b8880c7b;hb=a51cfbf3f8ca5c487fc8bbcecb4e456a08162a33;hp=f5aac606f4f1ed5c34a1c00011070870a813fa8e;hpb=aaf2ab15830321d9db33cd2e47f739fb52324110;p=yaz-moved-to-github.git

diff --git a/test/tstccl.c b/test/tstccl.c
index f5aac60..95975cc 100644
--- a/test/tstccl.c
+++ b/test/tstccl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstccl.c,v 1.15 2007-03-19 22:17:41 adam Exp $
+ * $Id: tstccl.c,v 1.17 2007-04-27 09:48:28 adam Exp $
  */
 
 /* CCL test */
@@ -16,19 +16,14 @@ static int tst_ccl_query(CCL_bibset bibset,
                          const char *query,
                          const char *result)
 {
-    CCL_parser parser = ccl_parser_create();
+    CCL_parser parser = ccl_parser_create(bibset);
     int ret = 0;
 
     if (parser && bibset)
     {
-        struct ccl_token *token_list;
         struct ccl_rpn_node *rpn;
         
-        parser->bibset = bibset;
-        
-        token_list = ccl_parser_tokenize(parser, query);
-        rpn = ccl_parser_find(parser, token_list);
-        ccl_token_del(token_list);
+        rpn = ccl_parser_find_str(parser, query);
         if (rpn)
         {
             /* parse ok. check that result is there and match */
@@ -132,6 +127,8 @@ void tst1(int pass)
 
             r = ccl_xml_config(bibset, xmlDocGetRootElement(doc), &addinfo);
             YAZ_CHECK_EQ(r, 0);
+
+            xmlFreeDoc(doc);
         }
         break;
 #else