X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-cql2rpn.cpp;h=62f50fe3dc7ebd869193ba6a04aed7f9f66bc864;hb=d62e0baee8ee3cccced41746ef09fc3e01f401d5;hp=79998405630df5f18b4002e5fb7e97a4ac5c205d;hpb=2c25ce513613784819fcb216c60d1584402e7907;p=yazpp-moved-to-github.git

diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp
index 7999840..62f50fe 100644
--- a/src/yaz-cql2rpn.cpp
+++ b/src/yaz-cql2rpn.cpp
@@ -1,13 +1,18 @@
-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-cql2rpn.cpp,v 1.4 2004-03-29 22:46:51 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <yaz/log.h>
+#include <yaz/diagsrw.h>
 #include <yaz/pquery.h>
-#include <yaz++/cql2rpn.h>
+#include <yaz/sortspec.h>
+#include <yazpp/cql2rpn.h>
+
+using namespace yazpp_1;
 
 Yaz_cql2rpn::Yaz_cql2rpn()
 {
@@ -17,62 +22,91 @@ Yaz_cql2rpn::Yaz_cql2rpn()
 Yaz_cql2rpn::~Yaz_cql2rpn()
 {
     if (m_transform)
-	cql_transform_close(m_transform);
+        cql_transform_close(m_transform);
 }
 
 void Yaz_cql2rpn::set_pqf_file(const char *fname)
 {
     if (!m_transform)
-	m_transform = cql_transform_open_fname(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)
+int Yaz_cql2rpn::query_transform(const char *cql_query,
+                                 Z_RPNQuery **rpnquery, ODR o,
+                                 char **addinfop)
 {
     const char *addinfo = 0;
     if (!m_transform)
-	return -3;
+        return -3;
     CQL_parser cp = cql_parser_create();
 
     int r = cql_parser_string(cp, cql_query);
     if (r)
     {
-	yaz_log(LOG_LOG, "CQL Parse Error");
-	r = 10;
+        r = YAZ_SRW_QUERY_SYNTAX_ERROR;
     }
     else
     {
-	char rpn_buf[1024];
-	r = cql_transform_buf(m_transform, cql_parser_result(cp), 
-			      rpn_buf, sizeof(rpn_buf)-1);
-	if (!r)
-	{
-	    YAZ_PQF_Parser pp = yaz_pqf_create();
+        WRBUF pqf = wrbuf_alloc();
+        r = cql_transform(m_transform, cql_parser_result(cp),
+                          wrbuf_vp_puts, pqf);
+        if (!r)
+        {
+            WRBUF sortkeys = wrbuf_alloc();
+            WRBUF sortspec = wrbuf_alloc();
+            if (cql_sortby_to_sortkeys(cql_parser_result(cp),
+                                       wrbuf_vp_puts, sortkeys))
+            {
+                r = YAZ_SRW_UNSUPP_SORT_TYPE;
+            }
+            else
+            {
+                yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sortkeys), sortspec);
+                Z_SortKeySpecList *sksl =
+                    yaz_sort_spec(o, wrbuf_cstr(sortspec));
+                if (sksl)
+                    yaz_sort_spec_to_type7(sksl, pqf);
+            }
+            wrbuf_destroy(sortspec);
+            wrbuf_destroy(sortkeys);
 
-	    *rpnquery = yaz_pqf_parse(pp, o, rpn_buf);
-	    if (!*rpnquery)
-	    {
-		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)",
-			pqf_msg, code);
-		r = -1;
-	    }
-	    yaz_pqf_destroy(pp);
-	}
-	else
-	{
-	    r = cql_transform_error(m_transform, &addinfo);
-	    yaz_log(LOG_LOG, "CQL Transform Error %d %s", r,
-		    addinfo ? addinfo : "");
-	}
-    }	
+            YAZ_PQF_Parser pp = yaz_pqf_create();
+
+            *rpnquery = yaz_pqf_parse(pp, o, wrbuf_cstr(pqf));
+            if (!*rpnquery)
+            {
+                size_t off;
+                const char *pqf_msg;
+                yaz_pqf_error(pp, &pqf_msg, &off);
+                r = -1;
+            }
+            yaz_pqf_destroy(pp);
+        }
+        else
+        {
+            r = cql_transform_error(m_transform, &addinfo);
+        }
+        wrbuf_destroy(pqf);
+    }
     cql_parser_destroy(cp);
-    if (addinfo)
-	*addinfop = odr_strdup(o, addinfo);
-    else
-	*addinfop = 0;
+    *addinfop = odr_strdup_null(o, addinfo);
     return r;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+