X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-cql2rpn.cpp;h=dfbcd4be6c1fd22ceb428a0b6c47c0aae8a83d8d;hb=805b4fdf7b70b0e9b298064f24ceff0c1d38e05b;hp=8a9ce1877a14017366eafab525daf6fe7bf3a07a;hpb=cd0004748ff588edb379f4967cfb03b376a55827;p=yazpp-moved-to-github.git

diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp
index 8a9ce18..dfbcd4b 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-2013 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-cql2rpn.cpp,v 1.11 2007-01-12 10:09:25 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <yaz/log.h>
 #include <yaz/pquery.h>
 #include <yazpp/cql2rpn.h>
@@ -37,7 +38,7 @@ bool Yaz_cql2rpn::parse_spec_file(const char *fname, int *error)
     return m_transform ? true : false;
 }
 
-int Yaz_cql2rpn::query_transform(const char *cql_query, 
+int Yaz_cql2rpn::query_transform(const char *cql_query,
                                  Z_RPNQuery **rpnquery, ODR o,
                                  char **addinfop)
 {
@@ -49,13 +50,12 @@ 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[10240];
-        r = cql_transform_buf(m_transform, cql_parser_result(cp), 
+        r = cql_transform_buf(m_transform, cql_parser_result(cp),
                               rpn_buf, sizeof(rpn_buf)-1);
         if (!r)
         {
@@ -66,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);
@@ -76,10 +74,8 @@ 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);
     if (addinfo)
         *addinfop = odr_strdup(o, addinfo);
@@ -90,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