X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_query_rewrite.cpp;h=159fbb99426ecfda23fe48eb1f53b91fc568cfec;hb=ab8cc809fd30019282584dbb2572bf38f6bd910d;hp=cffa7e386e2f24879ccf3d422ae3b73895fdc90f;hpb=743341841a21a695d08c99b27a30329119030db5;p=metaproxy-moved-to-github.git

diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp
index cffa7e3..159fbb9 100644
--- a/src/filter_query_rewrite.cpp
+++ b/src/filter_query_rewrite.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_query_rewrite.cpp,v 1.2 2006-01-20 22:38:12 marc Exp $
+/* $Id: filter_query_rewrite.cpp,v 1.3 2006-01-22 00:05:51 marc Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -25,12 +25,15 @@ namespace yp2 {
             //friend class QueryRewrite;
         public:
             void process(yp2::Package &package) const;
+            void configure(const xmlNode * ptr);
         private:
             void rewriteRegex(Z_Query *query) const;
         };
     }
 }
 
+// Class QueryRewrite frowarding to class QueryRewrite::Rep
+
 yf::QueryRewrite::QueryRewrite() : m_p(new Rep)
 {
 }
@@ -44,11 +47,19 @@ void yf::QueryRewrite::process(yp2::Package &package) const
     m_p->process(package);
 }
 
+void yp2::filter::QueryRewrite::configure(const xmlNode *ptr)
+{
+    m_p->configure(ptr);
+}
+
+
+// Class QueryRewrite::Rep implementation
+
 void yf::QueryRewrite::Rep::process(yp2::Package &package) const
 {
     if (package.session().is_closed())
     {
-        std::cout << "Got Close.\n";
+        //std::cout << "Got Close.\n";
     }
     
     Z_GDU *gdu = package.request().get();
@@ -56,14 +67,14 @@ void yf::QueryRewrite::Rep::process(yp2::Package &package) const
     if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
         Z_APDU_initRequest)
     {
-        std::cout << "Got Z3950 Init PDU\n";         
+        //std::cout << "Got Z3950 Init PDU\n";         
         //Z_InitRequest *req = gdu->u.z3950->u.initRequest;
         //package.request() = gdu;
     } 
     else if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
              Z_APDU_searchRequest)
     {
-        std::cout << "Got Z3950 Search PDU\n";   
+        //std::cout << "Got Z3950 Search PDU\n";   
         Z_SearchRequest *req = gdu->u.z3950->u.searchRequest;
 
         // applying regex query rewriting
@@ -90,7 +101,7 @@ void yf::QueryRewrite::Rep::process(yp2::Package &package) const
 void yf::QueryRewrite::Rep::rewriteRegex(Z_Query *query) const
 {
     std::string query_in = yp2::util::zQueryToString(query);
-    std::cout << "QUERY IN  '" << query_in << "'\n";
+    //std::cout << "QUERY IN  '" << query_in << "'\n";
 
     std::string query_out;
     
@@ -104,8 +115,8 @@ void yf::QueryRewrite::Rep::rewriteRegex(Z_Query *query) const
         //std::string expression("(<)|(>)|\\r");
         //std::string format("(?1&lt;)(?2&gt;)");
 
-        std::cout << "EXPRESSION  '" << expression << "'\n";
-        std::cout << "FORMAT      '" << format << "'\n";
+        //std::cout << "EXPRESSION  '" << expression << "'\n";
+        //std::cout << "FORMAT      '" << format << "'\n";
 
         rgx.assign(expression.c_str());
 
@@ -128,9 +139,9 @@ void yf::QueryRewrite::Rep::rewriteRegex(Z_Query *query) const
         match = regex_match(query_in, rgx, flags);
         search = regex_search(query_in, rgx, flags);
         query_out = boost::regex_replace(query_in, rgx, format, flags);
-        std::cout << "MATCH  '" << match <<  "'\n";
-        std::cout << "SEARCH '" << search <<  "'\n";
-        std::cout << "QUERY OUT '" << query_out << "'\n";
+        //std::cout << "MATCH  '" << match <<  "'\n";
+        //std::cout << "SEARCH '" << search <<  "'\n";
+        //std::cout << "QUERY OUT '" << query_out << "'\n";
 
     }
     catch(boost::regex_error &e)
@@ -145,6 +156,63 @@ void yf::QueryRewrite::Rep::rewriteRegex(Z_Query *query) const
 
 
 
+void yp2::filter::QueryRewrite::Rep::configure(const xmlNode *filter)
+{
+
+    //std::cout << "XML node '" << filter->name << "'\n";
+    yp2::xml::check_element_yp2(filter, "filter");
+
+    const xmlNode* regex 
+        = yp2::xml::jump_to_children(filter, XML_ELEMENT_NODE);
+    
+    while (regex){
+        //std::cout << "XML node '" << regex->name << "'\n";
+        yp2::xml::check_element_yp2(regex, "regex");
+
+        // parsing action
+//         const xmlNode* action 
+//             = yp2::xml::jump_to_children(regex, XML_ATTRIBUTE_NODE);
+//         if (action){
+//             std::cout << "XML node '" << action->name << "' '";
+//             std::cout << yp2::xml::get_text(action) << "'\n";
+//             //yp2::xml::check_element_yp2(expression, "expression");
+//         }
+
+        // parsing regex expression
+        std::string expr;
+        const xmlNode* expression 
+            = yp2::xml::jump_to_children(regex, XML_ELEMENT_NODE);
+        if (expression){
+            yp2::xml::check_element_yp2(expression, "expression");
+            expr = yp2::xml::get_text(expression);
+            //std::cout << "XML node '" << expression->name << "' '";
+            //std::cout << yp2::xml::get_text(expression) << "'\n";
+        }
+        
+        // parsing regex format
+        std::string form;
+        const xmlNode* format
+            =  yp2::xml::jump_to_next(expression, XML_ELEMENT_NODE);
+        if (format){
+            yp2::xml::check_element_yp2(format, "format");
+            form = yp2::xml::get_text(format);
+            //std::cout << "XML node '" << format->name << "' '";
+            //std::cout << yp2::xml::get_text(format) << "'\n";
+        }
+
+        // adding configuration
+        if (expr.size() && form.size()){
+            //std::cout << "adding regular expression\n";
+        }
+
+        // moving forward to next regex
+        regex = yp2::xml::jump_to_next(regex, XML_ELEMENT_NODE);
+    }
+    
+    // done parsing XML config
+    
+}
+
 static yp2::filter::Base* filter_creator()
 {
     return new yp2::filter::QueryRewrite;