X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-cql2rpn.cpp;h=cf597915c8897b754269e23fa00ce172a114e3f7;hb=75f7c460d6d10961f3d2ed841b757d6d6b7725d7;hp=c14242804b7e3d61bb9d94611030f2f83e5aca78;hpb=6019cb520cb877fa162d5915f9b578609cd7074d;p=yazpp-moved-to-github.git

diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp
index c142428..cf59791 100644
--- a/src/yaz-cql2rpn.cpp
+++ b/src/yaz-cql2rpn.cpp
@@ -1,13 +1,15 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-cql2rpn.cpp,v 1.3 2004-01-06 21:17:42 adam Exp $
+ * $Id: yaz-cql2rpn.cpp,v 1.7 2005-06-02 06:40:21 adam Exp $
  */
 
 #include <yaz/log.h>
 #include <yaz/pquery.h>
-#include <yaz++/proxy.h>
+#include <yaz++/cql2rpn.h>
+
+using namespace yazpp_1;
 
 Yaz_cql2rpn::Yaz_cql2rpn()
 {
@@ -38,7 +40,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query,
     int r = cql_parser_string(cp, cql_query);
     if (r)
     {
-	yaz_log(LOG_LOG, "CQL Parse Error");
+	yaz_log(YLOG_LOG, "CQL Parse Error");
 	r = 10;
     }
     else
@@ -56,7 +58,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(LOG_WARN, "PQF Parser Error %s (code %d)",
+		yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)",
 			pqf_msg, code);
 		r = -1;
 	    }
@@ -65,7 +67,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query,
 	else
 	{
 	    r = cql_transform_error(m_transform, &addinfo);
-	    yaz_log(LOG_LOG, "CQL Transform Error %d %s", r,
+	    yaz_log(YLOG_LOG, "CQL Transform Error %d %s", r,
 		    addinfo ? addinfo : "");
 	}
     }