Update source headers for 2008. Omit CVS ID keyword subst.

[yaz-moved-to-github.git] / test / tstccl.c

diff --git a/test/tstccl.c b/test/tstccl.c
index f5aac60..daf2fb6 100644 (file)
--- a/test/tstccl.c
+++ b/test/tstccl.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstccl.c,v 1.15 2007-03-19 22:17:41 adam Exp $
  */
 
 /* CCL test */
@@ -16,19 +14,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 +125,8 @@ void tst1(int pass)
 
             r = ccl_xml_config(bibset, xmlDocGetRootElement(doc), &addinfo);
             YAZ_CHECK_EQ(r, 0);
+
+            xmlFreeDoc(doc);
         }
         break;
 #else