X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Frouter_flexml.cpp;h=0a019eb9f2d9f2b49d501e9a1c1397838e71890a;hb=c1d953eee6c00432493bc364da6284704ccd9cc2;hp=f8307e93432f405206b8dbf1091b8122a7e237fb;hpb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;p=metaproxy-moved-to-github.git

diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp
index f8307e9..0a019eb 100644
--- a/src/router_flexml.cpp
+++ b/src/router_flexml.cpp
@@ -1,7 +1,5 @@
-/* $Id: router_flexml.cpp,v 1.23 2008-02-20 15:07:52 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,13 +12,12 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
-#include "xmlutil.hpp"
+#include <metaproxy/xmlutil.hpp>
 #include "router_flexml.hpp"
 #include "factory_filter.hpp"
 #include "factory_static.hpp"
@@ -28,6 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <iostream>
 #include <map>
 #include <list>
+#include <yaz/log.h>
+#include <yaz/xml_include.h>
 
 #include <boost/shared_ptr.hpp>
 
@@ -49,7 +48,8 @@ namespace metaproxy_1 {
         friend class RouterFleXML::Pos;
         Rep();
 
-        void base(xmlDocPtr doc, mp::FactoryFilter &factory, bool test_only);
+        void base(xmlDocPtr doc, mp::FactoryFilter &factory, bool test_only,
+                  const char *file_include_path);
 
         typedef std::map<std::string,
                          boost::shared_ptr<const mp::filter::Base > >
@@ -63,7 +63,8 @@ namespace metaproxy_1 {
 
         std::string m_dl_path;
 
-        void parse_xml_config_dom(xmlDocPtr doc, bool test_only);
+        void parse_xml_config_dom(xmlDocPtr doc, bool test_only,
+                                  const char *file_include_path);
 
         void parse_xml_filters(xmlDocPtr doc, const xmlNode *node,
             bool test_only);
@@ -119,8 +120,8 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
 
         if (!m_factory->exist(type_value))
         {
-            std::cout << "about to load " << type_value << ", path=" << 
-                m_dl_path << "\n";
+            yaz_log(YLOG_LOG, "Loading %s (dlpath %s)",
+                    type_value.c_str(), m_dl_path.c_str());
             m_factory->add_creator_dl(type_value, m_dl_path);
         }
         mp::filter::Base* filter_base = m_factory->create(type_value);
@@ -211,8 +212,8 @@ void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
             {
                 if (!m_factory->exist(type_value))
                 {
-                    std::cout << "about to load " << type_value << ", path=" << 
-                        m_dl_path << "\n";
+                    yaz_log(YLOG_LOG, "Loading %s (dlpath %s)",
+                            type_value.c_str(), m_dl_path.c_str());
                     m_factory->add_creator_dl(type_value, m_dl_path);
                 }
                 mp::filter::Base* filter_base = m_factory->create(type_value);
@@ -237,12 +238,20 @@ void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
 }
 
 void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc,
-                                                 bool test_only)
+                                                 bool test_only,
+                                                 const char *file_include_path)
 {
     if (!doc)
         throw mp::XMLError("Empty XML Document");
     
     const xmlNode* root = xmlDocGetRootElement(doc);
+
+    if (file_include_path)
+    {
+        int r = yaz_xml_include_simple((xmlNode *) root, file_include_path);
+        if (r)
+            throw mp::XMLError("YAZ XML Include failed");
+    }
     
     mp::xml::check_element_mp(root,  "metaproxy");
 
@@ -302,18 +311,18 @@ mp::RouterFleXML::Rep::Rep() : m_xinclude(false)
 }
 
 void mp::RouterFleXML::Rep::base(xmlDocPtr doc, mp::FactoryFilter &factory,
-    bool test_only)
+                                 bool test_only, const char *file_include_path)
 {
     m_factory = &factory;
-    parse_xml_config_dom(doc, test_only);
+    parse_xml_config_dom(doc, test_only, file_include_path);
     m_start_route = "start";
 }
 
 mp::RouterFleXML::RouterFleXML(xmlDocPtr doc, mp::FactoryFilter &factory,
-    bool test_only)
+                               bool test_only, const char *file_include_path)
     : m_p(new Rep)
 {
-    m_p->base(doc, factory, test_only);
+    m_p->base(doc, factory, test_only, file_include_path);
 }
 
 mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory,
@@ -328,7 +337,7 @@ mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory,
         throw mp::XMLError("xmlParseMemory failed");
     else
     {
-        m_p->base(doc, factory, test_only);
+        m_p->base(doc, factory, test_only, 0);
         xmlFreeDoc(doc);
     }
 }
@@ -386,11 +395,29 @@ mp::RouterFleXML::Pos::~Pos()
 }
 
 
+void mp::RouterFleXML::start()
+{
+    std::map<std::string,RouterFleXML::Route>::iterator route_it;
+
+    route_it = m_p->m_routes.begin();
+    while (route_it != m_p->m_routes.end())
+    {
+        RouterFleXML::Route route = route_it->second;
+
+        std::list<boost::shared_ptr<const mp::filter::Base> >::iterator it;
+
+        for (it = route.m_list.begin(); it != route.m_list.end(); it++)
+            (*it)->start();
+        route_it++;
+    }
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+