X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_http_rewrite.cpp;h=492d97a310b5d117a4810277f6fdf7d362b0346d;hb=bec25ede71e21b5905c696590da2dad757941411;hp=e69aba649f8bc2610107b3b4917005b57fb14211;hpb=3ef4df94516a136b7ee18ec8a45e740ef9e9dc05;p=metaproxy-moved-to-github.git

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index e69aba6..492d97a 100644
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/zgdu.h>
 #include <yaz/log.h>
 
+#include <stack>
 #include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
@@ -45,7 +46,7 @@ namespace metaproxy_1 {
             const std::string search_replace(
                 std::map<std::string, std::string> & vars,
                 const std::string & txt) const;
-            std::string sub_vars (
+            std::string sub_vars(
                 const std::map<std::string, std::string> & vars) const;
             void parse_groups();
         };
@@ -68,7 +69,9 @@ namespace metaproxy_1 {
 
         class HttpRewrite::Phase {
         public:
+            Phase();
             std::list<Within> within_list;
+            int m_verbose;
             void rewrite_reqline(mp::odr & o, Z_HTTP_Request *hreq,
                 std::map<std::string, std::string> & vars) const;
             void rewrite_headers(mp::odr & o, Z_HTTP_Header *headers,
@@ -87,7 +90,7 @@ namespace metaproxy_1 {
             void text(const char *value, int len);
             const Phase *m_phase;
             WRBUF m_w;
-            std::list<Within>::const_iterator enabled_within;
+            std::stack<std::list<Within>::const_iterator> s_within;
             std::map<std::string, std::string> &m_vars;
         public:
             Event(const Phase *p, std::map<std::string, std::string> &vars);
@@ -225,6 +228,9 @@ void yf::HttpRewrite::Phase::rewrite_body(mp::odr & o,
 
         HTMLParser parser;
         Event ev(this, vars);
+
+        parser.set_verbose(m_verbose);
+
         std::string buf(*content_buf, *content_len);
 
         parser.parse(ev, buf.c_str());
@@ -239,7 +245,6 @@ yf::HttpRewrite::Event::Event(const Phase *p,
     ) : m_phase(p), m_vars(vars)
 {
     m_w = wrbuf_alloc();
-    enabled_within = m_phase->within_list.end();
 }
 
 yf::HttpRewrite::Event::~Event()
@@ -254,23 +259,29 @@ const char *yf::HttpRewrite::Event::result()
 
 void yf::HttpRewrite::Event::openTagStart(const char *tag, int tag_len)
 {
-    // check if there is <within tag="x" .. />
-    if (enabled_within == m_phase->within_list.end())
+    wrbuf_putc(m_w, '<');
+    wrbuf_write(m_w, tag, tag_len);
+
+    std::string t(tag, tag_len);
+    std::list<Within>::const_iterator it = m_phase->within_list.begin();
+    for (; it != m_phase->within_list.end(); it++)
     {
-        std::string t(tag, tag_len);
-        std::list<Within>::const_iterator it =
-            m_phase->within_list.begin();
-        for (; it != m_phase->within_list.end(); it++)
+        if (it->tag.length() > 0 && yaz_strcasecmp(it->tag.c_str(),
+                                                   t.c_str()) == 0)
         {
-            if (it->tag.length() > 0 && yaz_strcasecmp(it->tag.c_str(),
-                                                       t.c_str()) == 0)
+            std::vector<std::string> attr;
+            boost::split(attr, it->attr, boost::is_any_of(","));
+            size_t i;
+            for (i = 0; i < attr.size(); i++)
             {
-                enabled_within = it;
+                if (attr[i].compare("#text") == 0)
+                {
+                    s_within.push(it);
+                    return;
+                }
             }
         }
     }
-    wrbuf_putc(m_w, '<');
-    wrbuf_write(m_w, tag, tag_len);
 }
 
 void yf::HttpRewrite::Event::anyTagEnd(const char *tag, int tag_len,
@@ -278,14 +289,12 @@ void yf::HttpRewrite::Event::anyTagEnd(const char *tag, int tag_len,
 {
     if (close_it)
     {
-        std::list<Within>::const_iterator it = enabled_within;
-        if (it != m_phase->within_list.end())
+        if (!s_within.empty())
         {
+            std::list<Within>::const_iterator it = s_within.top();
             std::string t(tag, tag_len);
             if (yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0)
-            {
-                enabled_within = m_phase->within_list.end();
-            }
+                s_within.pop();
         }
     }
     if (close_it)
@@ -340,14 +349,12 @@ void yf::HttpRewrite::Event::attribute(const char *tag, int tag_len,
 
 void yf::HttpRewrite::Event::closeTag(const char *tag, int tag_len)
 {
-    std::list<Within>::const_iterator it = enabled_within;
-    if (it != m_phase->within_list.end())
+    if (!s_within.empty())
     {
+        std::list<Within>::const_iterator it = s_within.top();
         std::string t(tag, tag_len);
         if (yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0)
-        {
-            enabled_within = m_phase->within_list.end();
-        }
+            s_within.pop();
     }
     wrbuf_puts(m_w, "</");
     wrbuf_write(m_w, tag, tag_len);
@@ -355,29 +362,11 @@ void yf::HttpRewrite::Event::closeTag(const char *tag, int tag_len)
 
 void yf::HttpRewrite::Event::text(const char *value, int len)
 {
-    std::list<Within>::const_iterator it = enabled_within;
-    bool subst = false;
-
-    if (it != m_phase->within_list.end())
-    {
-        subst = true;
-        if (it->attr.length() > 0)
-        {
-            subst = false;
-            std::vector<std::string> attr;
-            boost::split(attr, it->attr, boost::is_any_of(","));
-            size_t i;
-            for (i = 0; i < attr.size(); i++)
-            {
-                if (attr[i].compare("#text") == 0)
-                {
-                    subst = true;
-                }
-            }
-        }
-    }
+    std::list<Within>::const_iterator it = m_phase->within_list.end();
+    if (!s_within.empty())
+        it = s_within.top();
     std::string output;
-    if (subst)
+    if (it != m_phase->within_list.end())
     {
         std::string input(value, len);
         output = it->rule->test_patterns(m_vars, input);
@@ -510,8 +499,8 @@ void yf::HttpRewrite::Replace::parse_groups()
     regex = res;
 }
 
-std::string yf::HttpRewrite::Replace::sub_vars (
-        const std::map<std::string, std::string> & vars) const
+std::string yf::HttpRewrite::Replace::sub_vars(
+    const std::map<std::string, std::string> & vars) const
 {
     std::string out;
     bool esc = false;
@@ -560,9 +549,19 @@ std::string yf::HttpRewrite::Replace::sub_vars (
     return out;
 }
 
+yf::HttpRewrite::Phase::Phase() : m_verbose(0)
+{
+}
 
 void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase)
 {
+    static const char *names[2] = { "verbose", 0 };
+    std::string values[1];
+    values[0] = "0";
+    mp::xml::parse_attr(ptr, names, values);
+
+    phase.m_verbose = atoi(values[0].c_str());
+
     std::map<std::string, RulePtr > rules;
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {