X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=3bf08c481ef1c3238abea6a832a73d2889aff0fb;hb=0ab6e8aba7de1ea5cf109de175f56c9d8f7f49bc;hp=4ffcb6a89546a78bd20405a94795a52f5413fe08;hpb=5cb507c826353f8d11646d2f6d30de9f8bd3be46;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 4ffcb6a..3bf08c4 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,7 +1,22 @@
-/* $Id: metaproxy_prog.cpp,v 1.5 2006-04-29 08:51:54 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: metaproxy_prog.cpp,v 1.10 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
  */
 
 #include "config.hpp"
@@ -11,6 +26,7 @@ namespace po = boost::program_options;
 
 #include <iostream>
 #include <stdexcept>
+#include <libxml/xinclude.h>
 
 #include "filter.hpp"
 #include "package.hpp"
@@ -58,12 +74,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
         {