X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_query_rewrite.cpp;h=7b3940d7ade80c57aa8fc3d60fb0ea858ce5a67d;hb=ab6d1b138a82d09adac7e6a48a50b2ec198c47ee;hp=b030faca0f9d4921f8c449db3c51575ad52918f0;hpb=872baf038ffe10f670ba45082c6911201e2ac4cb;p=metaproxy-moved-to-github.git

diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp
index b030fac..7b3940d 100644
--- a/src/filter_query_rewrite.cpp
+++ b/src/filter_query_rewrite.cpp
@@ -1,7 +1,7 @@
-/* $Id: filter_query_rewrite.cpp,v 1.4 2006-03-15 14:55:17 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_query_rewrite.cpp,v 1.9 2006-12-01 12:37:26 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 
@@ -9,10 +9,8 @@
 #include "filter.hpp"
 #include "package.hpp"
 
-//#include <boost/thread/mutex.hpp>
-#include <boost/regex.hpp>
-
 #include "util.hpp"
+#include "xmlutil.hpp"
 #include "filter_query_rewrite.hpp"
 
 #include <yaz/zgdu.h>
@@ -22,15 +20,16 @@
 #include <libxslt/xsltutils.h>
 #include <libxslt/transform.h>
 
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
 
-namespace yp2 {
+namespace metaproxy_1 {
     namespace filter {
         class QueryRewrite::Rep {
         public:
             Rep();
             ~Rep();
-            void process(yp2::Package &package) const;
+            void process(mp::Package &package) const;
             void configure(const xmlNode * ptr);
         private:
             xsltStylesheetPtr m_stylesheet;
@@ -57,17 +56,17 @@ yf::QueryRewrite::~QueryRewrite()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
-void yf::QueryRewrite::process(yp2::Package &package) const
+void yf::QueryRewrite::process(mp::Package &package) const
 {
     m_p->process(package);
 }
 
-void yp2::filter::QueryRewrite::configure(const xmlNode *ptr)
+void mp::filter::QueryRewrite::configure(const xmlNode *ptr)
 {
     m_p->configure(ptr);
 }
 
-void yf::QueryRewrite::Rep::process(yp2::Package &package) const
+void yf::QueryRewrite::Rep::process(mp::Package &package) const
 {
     Z_GDU *gdu = package.request().get();
     
@@ -78,7 +77,7 @@ void yf::QueryRewrite::Rep::process(yp2::Package &package) const
         {
             int error_code = 0;
             const char *addinfo = 0;
-            yp2::odr odr;
+            mp::odr odr;
             Z_SearchRequest *req = apdu_req->u.searchRequest;
             
             xmlDocPtr doc_input = 0;
@@ -123,33 +122,49 @@ void yf::QueryRewrite::Rep::process(yp2::Package &package) const
     package.move();
 }
 
-void yp2::filter::QueryRewrite::Rep::configure(const xmlNode *ptr)
+void mp::filter::QueryRewrite::Rep::configure(const xmlNode *ptr)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
         if (ptr->type != XML_ELEMENT_NODE)
             continue;
-        if (!strcmp((const char *) ptr->name, "xslt"))
+
+        if (mp::xml::check_element_mp(ptr, "xslt"))
         {
             if (m_stylesheet)
             {
-                throw yp2::filter::FilterException
+                throw mp::filter::FilterException
                     ("Only one xslt element allowed in query_rewrite filter");
             }
 
-            std::string fname = yp2::xml::get_text(ptr);
+            std::string fname;// = mp::xml::get_text(ptr);
+
+            for (struct _xmlAttr *attr = ptr->properties; 
+                 attr; attr = attr->next)
+            {
+                mp::xml::check_attribute(attr, "", "stylesheet");
+                fname = mp::xml::get_text(attr);            
+            }
+
+            if (0 == fname.size())
+                throw mp::filter::FilterException
+                    ("Attribute <xslt stylesheet=\"" 
+                     + fname
+                     + "\"> needs XSLT stylesheet path content"
+                     + " in query_rewrite filter");
+            
             m_stylesheet = xsltParseStylesheetFile(BAD_CAST fname.c_str());
             if (!m_stylesheet)
             {
-                throw yp2::filter::FilterException
-                    ("Failed to read stylesheet " 
+                throw mp::filter::FilterException
+                    ("Failed to read XSLT stylesheet '" 
                      + fname
-                     + " in query_rewrite filter");
+                     + "' in query_rewrite filter");
             }
         }
         else
         {
-            throw yp2::filter::FilterException
+            throw mp::filter::FilterException
                 ("Bad element " 
                  + std::string((const char *) ptr->name)
                  + " in query_rewrite filter");
@@ -157,15 +172,15 @@ void yp2::filter::QueryRewrite::Rep::configure(const xmlNode *ptr)
     }
 }
 
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
 {
-    return new yp2::filter::QueryRewrite;
+    return new mp::filter::QueryRewrite;
 }
 
 extern "C" {
-    struct yp2_filter_struct yp2_filter_query_rewrite = {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_query_rewrite = {
         0,
-        "query-rewrite",
+        "query_rewrite",
         filter_creator
     };
 }