rewrite: do not even compare content types, if we don't have any

[metaproxy-moved-to-github.git] / src / filter_cql_to_rpn.cpp

diff --git a/src/filter_cql_to_rpn.cpp b/src/filter_cql_to_rpn.cpp
index 9b3e20b..996af58 100644 (file)
--- a/src/filter_cql_to_rpn.cpp
+++ b/src/filter_cql_to_rpn.cpp
@@ -1,26 +1,35 @@
-/* $Id: filter_cql_to_rpn.cpp,v 1.4 2007-01-16 08:49:05 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2013 Index Data
 
-   See the LICENSE file for details
- */
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
 
 #include "filter_cql_to_rpn.hpp"
 
-
-#include <yaz/log.h>
+#include <yazpp/z-query.h>
 #include <yaz/cql.h>
+#include <yazpp/cql2rpn.h>
 #include <yaz/zgdu.h>
-#include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 #include <yaz/srw.h>
-#include <yazpp/z-query.h>
-#include <yazpp/cql2rpn.h>
 
 
 namespace mp = metaproxy_1;
@@ -42,7 +51,7 @@ namespace metaproxy_1 {
 
 
 // define Pimpl wrapper forwarding to Impl
- 
+
 yf::CQLtoRPN::CQLtoRPN() : m_p(new Impl)
 {
 }
@@ -51,7 +60,8 @@ yf::CQLtoRPN::~CQLtoRPN()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
-void yf::CQLtoRPN::configure(const xmlNode *xmlnode)
+void yf::CQLtoRPN::configure(const xmlNode *xmlnode, bool test_only,
+                             const char *path)
 {
     m_p->configure(xmlnode);
 }
@@ -69,7 +79,7 @@ yf::CQLtoRPN::Impl::Impl()
 }
 
 yf::CQLtoRPN::Impl::~Impl()
-{ 
+{
 }
 
 void yf::CQLtoRPN::Impl::configure(const xmlNode *xmlnode)
@@ -80,7 +90,7 @@ void yf::CQLtoRPN::Impl::configure(const xmlNode *xmlnode)
       <conversion file="pqf.properties"/>
       </filter>
     */
-    
+
     std::string fname;
     for (xmlnode = xmlnode->children; xmlnode; xmlnode = xmlnode->next)
     {
@@ -101,21 +111,22 @@ void yf::CQLtoRPN::Impl::configure(const xmlNode *xmlnode)
         }
         else
         {
-            throw mp::filter::FilterException("Bad element " 
+            throw mp::filter::FilterException("Bad element "
                                                + std::string((const char *)
                                                              xmlnode->name));
         }
     }
     if (fname.length() == 0)
     {
-        throw mp::filter::FilterException("Missing conversion spec for "
-                                          "filter cql_rpn");
+        throw mp::filter::FilterException("Missing conversion configuration "
+                                          "for filter cql_rpn");
     }
 
     int error = 0;
     if (!m_cql2rpn.parse_spec_file(fname.c_str(), &error))
     {
-        throw mp::filter::FilterException("Bad or missing CQL to RPN spec "
+        throw mp::filter::FilterException("Bad or missing "
+                                          "CQL to RPN configuration "
                                           + fname);
     }
 }
@@ -135,18 +146,17 @@ void yf::CQLtoRPN::Impl::process(mp::Package &package)
             char *addinfo = 0;
             Z_RPNQuery *rpnquery = 0;
             mp::odr odr;
-            
+
             int r = m_cql2rpn.query_transform(sr->query->u.type_104->u.cql,
                                                  &rpnquery, odr,
                                                  &addinfo);
             if (r == -3)
             {
-                yaz_log(YLOG_LOG, "No CQL to RPN table");
-                Z_APDU *f_apdu = 
+                Z_APDU *f_apdu =
                     odr.create_searchResponse(
-                        apdu_req, 
-                        YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
-                        "Missing CQL to RPN spec");
+                        apdu_req,
+                        YAZ_BIB1_PERMANENT_SYSTEM_ERROR,
+                        "cql_rpn: missing CQL to RPN configuration");
                 package.response() = f_apdu;
                 return;
             }
@@ -154,15 +164,14 @@ void yf::CQLtoRPN::Impl::process(mp::Package &package)
             {
                 int error_code = yaz_diag_srw_to_bib1(r);
 
-                yaz_log(YLOG_LOG, "CQL Conversion error %d", r);
-                Z_APDU *f_apdu = 
+                Z_APDU *f_apdu =
                     odr.create_searchResponse(apdu_req, error_code, addinfo);
                 package.response() = f_apdu;
                 return;
             }
             else
             {   // conversion OK
-                
+
                 sr->query->which = Z_Query_type_1;
                 sr->query->u.type_1 = rpnquery;
                 package.request() = gdu;
@@ -179,7 +188,7 @@ static mp::filter::Base* filter_creator()
 }
 
 extern "C" {
-    struct metaproxy_1_filter_struct metaproxy_1_filter_cql_to_rpn = {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_cql_rpn = {
         0,
         "cql_rpn",
         filter_creator
@@ -189,8 +198,9 @@ extern "C" {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+