Caches NamePlusRecord BER; works well

[yaz-moved-to-github.git] / src / yaz-ccl.c

diff --git a/src/yaz-ccl.c b/src/yaz-ccl.c
index a74dd9d..7536945 100644 (file)
--- a/src/yaz-ccl.c
+++ b/src/yaz-ccl.c
@@ -1,18 +1,18 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaz-ccl.c,v 1.4 2005-06-25 15:46:06 adam Exp $
  */
 /**
  * \file yaz-ccl.c
  * \brief Implements CCL node tree to RPN converson.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <yaz/yaz-ccl.h>
 #include <yaz/pquery.h>
@@ -25,9 +25,9 @@ Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
 
     ccl_pquery(wr, p);
 
-    q = yaz_pqf_parse(parser, o, wrbuf_buf(wr));
+    q = yaz_pqf_parse(parser, o, wrbuf_cstr(wr));
 
-    wrbuf_free(wr, 1);
+    wrbuf_destroy(wr);
     yaz_pqf_destroy(parser);
     return q;
 }
@@ -41,9 +41,9 @@ Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p)
 
     ccl_pquery(wr, p);
 
-    q = yaz_pqf_scan(parser, o, &setp, wrbuf_buf(wr));
+    q = yaz_pqf_scan(parser, o, &setp, wrbuf_cstr(wr));
 
-    wrbuf_free(wr, 1);
+    wrbuf_destroy(wr);
     yaz_pqf_destroy(parser);
     return q;
 }
@@ -51,6 +51,7 @@ Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab