X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_query_rewrite.cpp;h=159fbb99426ecfda23fe48eb1f53b91fc568cfec;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=8ae8400afe8108effdaf2ed4fd093ea4d2461bf8;hpb=22c6fb6df0d4b56f388ea8fdd09550a5f3410ee2;p=metaproxy-moved-to-github.git diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp index 8ae8400..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.1 2006-01-19 12:18:09 marc Exp $ +/* $Id: filter_query_rewrite.cpp,v 1.3 2006-01-22 00:05:51 marc Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -10,6 +10,7 @@ #include "package.hpp" //#include +#include #include "util.hpp" #include "filter_query_rewrite.hpp" @@ -21,15 +22,20 @@ namespace yf = yp2::filter; namespace yp2 { namespace filter { class QueryRewrite::Rep { - friend class QueryRewrite; - int dummy; + //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) { - m_p->dummy = 1; } yf::QueryRewrite::~QueryRewrite() @@ -38,10 +44,22 @@ yf::QueryRewrite::~QueryRewrite() 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(); @@ -49,16 +67,25 @@ void yf::QueryRewrite::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"; - //Z_SearchRequest *req = gdu->u.z3950->u.searchRequest; - //package.request() = gdu; + //std::cout << "Got Z3950 Search PDU\n"; + Z_SearchRequest *req = gdu->u.z3950->u.searchRequest; + + // applying regex query rewriting + rewriteRegex(req->query); + + // fold new query structure into gdu package .. + // yp2::util::pqf(odr, gdu->u.z3950, query_out); + // question: which odr structure to use in this call ?? + // memory alignment has to be correct, this is a little tricky ... + // I'd rather like to alter the gdu and pack it back using: + package.request() = gdu; } else if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == Z_APDU_scanRequest) @@ -70,6 +97,122 @@ void yf::QueryRewrite::process(yp2::Package &package) const package.move(); } + +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::string query_out; + + boost::regex rgx; + try{ + // make regular expression replacement here + std::string expression("@attr 1=4"); + std::string format("@attr 1=4 @attr 4=3"); + //std::string expression("the"); + //std::string format("else"); + //std::string expression("(<)|(>)|\\r"); + //std::string format("(?1<)(?2>)"); + + //std::cout << "EXPRESSION '" << expression << "'\n"; + //std::cout << "FORMAT '" << format << "'\n"; + + rgx.assign(expression.c_str()); + + bool match(false); + bool search(false); + + // other flags + // see http://www.boost.org/libs/regex/doc/match_flag_type.html + //boost::match_flag_type flags = boost::match_default; + // boost::format_default + // boost::format_perl + // boost::format_literal + // boost::format_all + // boost::format_no_copy + // boost::format_first_only + + boost::match_flag_type flags + = boost::match_default | boost::format_all; + + 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"; + + } + catch(boost::regex_error &e) + { + std::cout << "REGEX Error code=" << e.code() + << " position=" << e.position() << "\n"; + } + + //std::cout << "QUERY OUT '" << query_out << "'\n"; + // still need to fold this new rpn query string into Z_Query structure... +} + + + +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;