X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_query_rewrite.cpp;h=4828781d41329755165253fd9015be1dfb230d73;hb=1b9283b18eccbe5b776be0fae8a396228b03f099;hp=6b2bfb90d9a903b482cfa789f81684b3310b3572;hpb=fbd550a4d263e71607b13109ad8f7d92dfcbc741;p=metaproxy-moved-to-github.git

diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp
index 6b2bfb9..4828781 100644
--- a/src/filter_query_rewrite.cpp
+++ b/src/filter_query_rewrite.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) Index Data
 
 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
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/xmlquery.h>
 #include <yaz/diagbib1.h>
 #include <yaz/query-charset.h>
+#include <yaz/tpath.h>
 
 #include <libxslt/xsltutils.h>
 #include <libxslt/transform.h>
@@ -42,7 +43,8 @@ namespace metaproxy_1 {
             Rep();
             ~Rep();
             void process(mp::Package &package) const;
-            void configure(const xmlNode * ptr);
+            void configure(const xmlNode * ptr, bool test_only,
+                           const char *path);
         private:
             xsltStylesheetPtr m_stylesheet;
             std::string charset_from;
@@ -69,21 +71,21 @@ yf::QueryRewrite::~QueryRewrite()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
-void yf::QueryRewrite::process(mp::Package &package) const
+void mp::filter::QueryRewrite::configure(const xmlNode *ptr, bool test_only,
+                                         const char *path)
 {
-    m_p->process(package);
+    m_p->configure(ptr, test_only, path);
 }
 
-void mp::filter::QueryRewrite::configure(const xmlNode *ptr, bool test_only,
-                                         const char *path)
+void yf::QueryRewrite::process(mp::Package &package) const
 {
-    m_p->configure(ptr);
+    m_p->process(package);
 }
 
 void yf::QueryRewrite::Rep::process(mp::Package &package) const
 {
     Z_GDU *gdu = package.request().get();
-    
+
     if (gdu && gdu->which == Z_GDU_Z3950)
     {
         Z_APDU *apdu_req = gdu->u.z3950;
@@ -93,18 +95,13 @@ void yf::QueryRewrite::Rep::process(mp::Package &package) const
             const char *addinfo = 0;
             mp::odr odr;
             Z_SearchRequest *req = apdu_req->u.searchRequest;
-            
+
             if (m_stylesheet)
             {
                 xmlDocPtr doc_input = 0;
                 yaz_query2xml(req->query, &doc_input);
-                
-                if (!doc_input)
-                {
-                    error_code = YAZ_BIB1_MALFORMED_QUERY;
-                    addinfo = "converion from Query to XML failed";
-                }
-                else
+
+                if (doc_input)
                 {
                     xmlDocPtr doc_res = xsltApplyStylesheet(m_stylesheet,
                                                             doc_input, 0);
@@ -123,7 +120,7 @@ void yf::QueryRewrite::Rep::process(mp::Package &package) const
                     xmlFreeDoc(doc_input);
                 }
             }
-            if (charset_to.length() && charset_from.length() &&
+            if (!error_code && charset_to.length() && charset_from.length() &&
                 (req->query->which == Z_Query_type_1
                  || req->query->which == Z_Query_type_101))
             {
@@ -143,18 +140,19 @@ void yf::QueryRewrite::Rep::process(mp::Package &package) const
             }
             if (error_code)
             {
-                Z_APDU *f_apdu = 
+                Z_APDU *f_apdu =
                     odr.create_searchResponse(apdu_req, error_code, addinfo);
                 package.response() = f_apdu;
                 return;
             }
             package.request() = gdu;
-        } 
+        }
     }
     package.move();
 }
 
-void mp::filter::QueryRewrite::Rep::configure(const xmlNode *ptr)
+void mp::filter::QueryRewrite::Rep::configure(const xmlNode *ptr,
+                                              bool test_only, const char *path)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -169,34 +167,41 @@ void mp::filter::QueryRewrite::Rep::configure(const xmlNode *ptr)
                     ("Only one xslt element allowed in query_rewrite filter");
             }
 
-            std::string fname;// = mp::xml::get_text(ptr);
+            std::string fname;
 
-            for (struct _xmlAttr *attr = ptr->properties; 
+            for (struct _xmlAttr *attr = ptr->properties;
                  attr; attr = attr->next)
             {
                 mp::xml::check_attribute(attr, "", "stylesheet");
-                fname = mp::xml::get_text(attr);            
+                fname = mp::xml::get_text(attr);
             }
 
             if (0 == fname.size())
                 throw mp::filter::FilterException
-                    ("Attribute <xslt stylesheet=\"" 
+                    ("Attribute <xslt stylesheet=\""
                      + fname
                      + "\"> needs XSLT stylesheet path content"
                      + " in query_rewrite filter");
-            
-            m_stylesheet = xsltParseStylesheetFile(BAD_CAST fname.c_str());
+
+            char fullpath[1024];
+            char *cp = yaz_filepath_resolve(fname.c_str(), path, 0, fullpath);
+            if (!cp)
+            {
+                throw mp::filter::FilterException("Cannot read XSLT " + fname);
+            }
+
+            m_stylesheet = xsltParseStylesheetFile(BAD_CAST cp);
             if (!m_stylesheet)
             {
                 throw mp::filter::FilterException
-                    ("Failed to read XSLT stylesheet '" 
+                    ("Failed to read XSLT stylesheet '"
                      + fname
                      + "' in query_rewrite filter");
             }
         }
         else if (mp::xml::is_element_mp(ptr, "charset"))
         {
-            for (struct _xmlAttr *attr = ptr->properties; 
+            for (struct _xmlAttr *attr = ptr->properties;
                  attr; attr = attr->next)
             {
                 if (!strcmp((const char *) attr->name, "from"))
@@ -216,7 +221,7 @@ void mp::filter::QueryRewrite::Rep::configure(const xmlNode *ptr)
         else
         {
             throw mp::filter::FilterException
-                ("Bad element " 
+                ("Bad element "
                  + std::string((const char *) ptr->name)
                  + " in query_rewrite filter");
         }