X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=e231ee55945ae3e21a997753b528708d6a1a261e;hb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;hp=0bec0772d5c9137e8d62f5aef98a669ea9636198;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 0bec077..e231ee5 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,5 +1,5 @@
-/* $Id: metaproxy_prog.cpp,v 1.6 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: metaproxy_prog.cpp,v 1.9 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -11,6 +11,7 @@ namespace po = boost::program_options;
 
 #include <iostream>
 #include <stdexcept>
+#include <libxml/xinclude.h>
 
 #include "filter.hpp"
 #include "package.hpp"
@@ -58,12 +59,23 @@ int main(int argc, char **argv)
                 std::exit(1);
             }
             
-            doc = xmlParseFile(config_fnames[0].c_str());
+            // need to parse with xinclude tags 
+            // XML_PARSE_XINCLUDE XML_PARSE_NOBLANKS  
+            // XML_PARSE_NSCLEAN XML_PARSE_NONET 
+            doc = xmlReadFile(config_fnames[0].c_str(), 
+                              NULL, 
+                              XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
+                              + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
+
             if (!doc)
             {
-                std::cerr << "xmlParseFile failed\n";
+                std::cerr << "XML parsing failed\n";
                 std::exit(1);
             }
+            // and perform Xinclude then
+            if (xmlXIncludeProcess(doc) > 0) {
+                std::cerr << "processing XInclude directive\n";
+            }
         }
         else
         {