From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 19 Jul 2011 10:35:45 +0000 (+0200)
Subject: Parse file_include_path to filter parsing
X-Git-Tag: v1.2.10~12
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=f3d6c3fed28aad086369677f9b677ba52e805f04;hp=42b728b3414f1d68863b1b3f2209340483c9fd80;p=metaproxy-moved-to-github.git

Parse file_include_path to filter parsing
---

diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp
index 0a019eb..7aca757 100644
--- a/src/router_flexml.cpp
+++ b/src/router_flexml.cpp
@@ -67,9 +67,9 @@ namespace metaproxy_1 {
                                   const char *file_include_path);
 
         void parse_xml_filters(xmlDocPtr doc, const xmlNode *node,
-            bool test_only);
+                               bool test_only, const char *file_include_path);
         void parse_xml_routes(xmlDocPtr doc, const xmlNode *node,
-            bool test_only);
+                              bool test_only, const char *file_include_path);
 
         bool m_xinclude;
     private:
@@ -91,7 +91,8 @@ namespace metaproxy_1 {
 
 void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
                                               const xmlNode *node,
-                                              bool test_only)
+                                              bool test_only,
+                                              const char *file_include_path)
 {
     unsigned int filter_nr = 0;
     while(node && mp::xml::check_element_mp(node, "filter"))
@@ -140,7 +141,8 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
 
 void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
                                              const xmlNode *node,
-                                             bool test_only)
+                                             bool test_only,
+                                             const char *file_include_path)
 {
     mp::xml::check_element_mp(node, "route");
 
@@ -288,7 +290,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc,
     {
         parse_xml_filters(doc, mp::xml::jump_to_children(node,
                                                          XML_ELEMENT_NODE),
-            test_only);
+                          test_only, file_include_path);
                       
         node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
     }
@@ -296,7 +298,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc,
     mp::xml::check_element_mp(node, "routes");
     
     parse_xml_routes(doc, mp::xml::jump_to_children(node, XML_ELEMENT_NODE),
-        test_only);
+                     test_only, file_include_path);
 
     node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
     if (node)