X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-cql2rpn.cpp;h=f49ff19ee9db87762a5434cc0db9cc129ea02252;hb=bed85d2160500f57db63f4ab9d5533e0225cce15;hp=e1457915ae50172af339e54113842b957fe40343;hpb=0cc824e02bc2c69986bec8c9dd9ff53f07a0cd3d;p=yazpp-moved-to-github.git

diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp
index e145791..f49ff19 100644
--- a/src/yaz-cql2rpn.cpp
+++ b/src/yaz-cql2rpn.cpp
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2012 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-cql2rpn.cpp,v 1.9 2006-03-29 13:14:15 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <yaz/log.h>
 #include <yaz/pquery.h>
 #include <yazpp/cql2rpn.h>
@@ -28,6 +29,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,12 +50,11 @@ 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
     {
-        char rpn_buf[1024];
+        char rpn_buf[10240];
         r = cql_transform_buf(m_transform, cql_parser_result(cp), 
                               rpn_buf, sizeof(rpn_buf)-1);
         if (!r)
@@ -57,9 +66,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 +74,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);
@@ -81,6 +86,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab