X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=4cba4248ff701d16d597848c15045f37a0de3716;hb=fa00fb98e9c388425c63d64c1684fcda311a5ca6;hp=cdcd2446555dea59e4cc69e1c550b858be32b79f;hpb=993d2e36979a8cd82ce582205d3f9638b3daca46;p=metaproxy-moved-to-github.git diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp index cdcd244..4cba424 100644 --- a/src/metaproxy_prog.cpp +++ b/src/metaproxy_prog.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2008 Index Data + Copyright (C) 2005-2009 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 @@ -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;