Public MP headers in include/metaproxy

[metaproxy-moved-to-github.git] / src / metaproxy_prog.cpp

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 47f84ab..9f144b7 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2009 Index Data
+   Copyright (C) 2005-2010 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
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdexcept>
 #include <libxml/xinclude.h>
 
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
 #include "router_flexml.hpp"
 #include "factory_static.hpp"
 
@@ -144,8 +144,11 @@ static int sc_main(
             return 1;
         }
         // and perform Xinclude then
-        if (xmlXIncludeProcess(doc) > 0) {
-            yaz_log (YLOG_LOG, "processing XInclude directive");
+        int r = xmlXIncludeProcess(doc);
+        if (r == -1)
+        {
+            yaz_log(YLOG_FATAL, "XInclude processing failed");
+            return 1;
         }
         mp::FactoryStatic factory;
         mp::RouterFleXML router(doc, factory, false);
@@ -159,11 +162,11 @@ static int sc_main(
         return 1;
     }
     catch (std::runtime_error &e) {
-        yaz_log (YLOG_FATAL, "std::runtime error: %s" , e.what() );
+        yaz_log(YLOG_FATAL, "std::runtime error: %s" , e.what() );
         return 1;
     }
     catch ( ... ) {
-        yaz_log (YLOG_FATAL, "Unknown Exception");
+        yaz_log(YLOG_FATAL, "Unknown Exception");
         return 1;
     }
     return 0;