X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fstatserv.c;h=dfba86b9b4fa3cdd5b7a633ec2a20d6f536b97e0;hb=ee52d7a5f2325315de5391696bef64336ad88dbc;hp=f6542c661dec403ccc86ce2c8578ff1dea8a24ab;hpb=c8e6236a5d7deea490a8c6902735f70c1515c0dc;p=yaz-moved-to-github.git

diff --git a/src/statserv.c b/src/statserv.c
index f6542c6..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.27 2005-03-08 11:48:09 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
@@ -440,8 +441,18 @@ static void xml_config_open()
 	xml_config_doc = xmlParseFile(control_block.xml_config);
 	if (!xml_config_doc)
 	{
-	    yaz_log(YLOG_WARN, "Could not parse %s", control_block.xml_config);
-	    return ;
+	    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();