WRBUF updates

[yazpp-moved-to-github.git] / src / yaz-cql2rpn.cpp

diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp
index fd4e5a9..2354b8b 100644 (file)
--- a/src/yaz-cql2rpn.cpp
+++ b/src/yaz-cql2rpn.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-cql2rpn.cpp,v 1.10 2006-09-11 23:06:28 adam Exp $
+ * $Id: yaz-cql2rpn.cpp,v 1.14 2007-03-20 07:54:11 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -28,6 +28,15 @@ void Yaz_cql2rpn::set_pqf_file(const char *fname)
         m_transform = cql_transform_open_fname(fname);
 }
 
+
+bool Yaz_cql2rpn::parse_spec_file(const char *fname, int *error)
+{
+    *error = 0;
+    cql_transform_close(m_transform);
+    m_transform = cql_transform_open_fname(fname);
+    return m_transform ? true : false;
+}
+
 int Yaz_cql2rpn::query_transform(const char *cql_query, 
                                  Z_RPNQuery **rpnquery, ODR o,
                                  char **addinfop)
@@ -40,7 +49,6 @@ int Yaz_cql2rpn::query_transform(const char *cql_query,
     int r = cql_parser_string(cp, cql_query);
     if (r)
     {
-        yaz_log(YLOG_LOG, "CQL Parse Error");
         r = 10;
     }
     else
@@ -57,9 +65,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query,
             {
                 size_t off;
                 const char *pqf_msg;
-                int code = yaz_pqf_error(pp, &pqf_msg, &off);
-                yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)",
-                        pqf_msg, code);
+                yaz_pqf_error(pp, &pqf_msg, &off);
                 r = -1;
             }
             yaz_pqf_destroy(pp);
@@ -67,8 +73,6 @@ int Yaz_cql2rpn::query_transform(const char *cql_query,
         else
         {
             r = cql_transform_error(m_transform, &addinfo);
-            yaz_log(YLOG_LOG, "CQL Transform Error %d %s", r,
-                    addinfo ? addinfo : "");
         }
     }   
     cql_parser_destroy(cp);