From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 14 Mar 2005 11:14:21 +0000 (+0000)
Subject: Support XInclude for XML config
X-Git-Tag: YAZ.2.1.0~5
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=bd2e35d738cb215abd9b113ffe3859a65b39d619;p=yaz-moved-to-github.git

Support XInclude for XML config
---

diff --git a/src/statserv.c b/src/statserv.c
index 105d327..dfba86b 100644
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -5,7 +5,7 @@
  * NT threaded server code by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
- * $Id: statserv.c,v 1.28 2005-03-08 13:59:08 adam Exp $
+ * $Id: statserv.c,v 1.29 2005-03-14 11:14:21 adam Exp $
  */
 
 /**
@@ -38,6 +38,7 @@
 #if HAVE_XML2
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#include <libxml/xinclude.h>
 #endif
 
 #if YAZ_POSIX_THREADS
@@ -443,6 +444,16 @@ static void xml_config_open()
 	    yaz_log(YLOG_FATAL, "Could not parse %s", control_block.xml_config);
 	    exit(1);
 	}
+	else
+	{
+	    int noSubstitutions = xmlXIncludeProcess(xml_config_doc);
+	    if (noSubstitutions == -1)
+	    {
+		yaz_log(YLOG_WARN, "XInclude processing failed for config %s",
+			control_block.xml_config);
+		exit(1);
+	    }
+	}
     }
     xml_config_read();
 #endif