diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2009-11-05 07:48:28 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-11-05 07:48:28 +0200 |
commit | 8965bbe98b08b47370ea8ecca830707745ae383b (patch) | |
tree | 4af8762062ff4badd9c68954e819487825c4c6f8 /examples/cxx/tree | |
parent | 9878dfe26a08ea5638c562c22c9becd11d462015 (diff) |
Handle loadGrammar failures
Diffstat (limited to 'examples/cxx/tree')
-rw-r--r-- | examples/cxx/tree/caching/driver.cxx | 24 | ||||
-rw-r--r-- | examples/cxx/tree/performance/parsing.cxx | 21 |
2 files changed, 39 insertions, 6 deletions
diff --git a/examples/cxx/tree/caching/driver.cxx b/examples/cxx/tree/caching/driver.cxx index 015606f..0a811e4 100644 --- a/examples/cxx/tree/caching/driver.cxx +++ b/examples/cxx/tree/caching/driver.cxx @@ -16,7 +16,6 @@ #include <xsd/cxx/xml/dom/bits/error-handler-proxy.hxx> #include <xsd/cxx/xml/sax/std-input-source.hxx> -#include <xsd/cxx/tree/exceptions.hxx> #include <xsd/cxx/tree/error-handler.hxx> #include "library.hxx" @@ -105,7 +104,17 @@ main (int argc, char* argv[]) // Initialize the schema cache. // - parser->loadGrammar ("library.xsd", Grammar::SchemaGrammarType, true); + if (!parser->loadGrammar ("library.xsd", Grammar::SchemaGrammarType, true)) + { + // In Xerces-C++ grammar loading failure results in just a warning. + // Make it a fatal error. + // + eh.handle ("library.xsd", 0, 0, + tree::error_handler<char>::severity::fatal, + "unable to load schema"); + } + + eh.throw_if_failed<xml_schema::parsing> (); conf->setParameter (XMLUni::fgXercesUseCachedGrammarInParse, true); // We will release the DOM document ourselves. @@ -133,7 +142,14 @@ main (int argc, char* argv[]) xml::dom::bits::error_handler_proxy<char> ehp (eh); parser->setErrorHandler (&ehp); - parser->loadGrammar ("library.xsd", Grammar::SchemaGrammarType, true); + if (!parser->loadGrammar ("library.xsd", Grammar::SchemaGrammarType, true)) + { + eh.handle ("library.xsd", 0, 0, + tree::error_handler<char>::severity::fatal, + "unable to load schema"); + } + + eh.throw_if_failed<xml_schema::parsing> (); parser->setFeature (XMLUni::fgXercesUseCachedGrammarInParse, true); parser->setFeature (XMLUni::fgXercesUserAdoptsDOMDocument, true); @@ -161,7 +177,7 @@ main (int argc, char* argv[]) xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (wrap)); #endif - eh.throw_if_failed<tree::parsing<char> > (); + eh.throw_if_failed<xml_schema::parsing> (); // Parse DOM to the object model. // diff --git a/examples/cxx/tree/performance/parsing.cxx b/examples/cxx/tree/performance/parsing.cxx index 3997ea6..b7413a7 100644 --- a/examples/cxx/tree/performance/parsing.cxx +++ b/examples/cxx/tree/performance/parsing.cxx @@ -99,7 +99,17 @@ parsing (const char* file, unsigned long iter, bool validate) // If we are validating, pre-load and cache the schema. // - parser->loadGrammar ("test.xsd", Grammar::SchemaGrammarType, true); + if (!parser->loadGrammar ("test.xsd", Grammar::SchemaGrammarType, true)) + { + // In Xerces-C++ grammar loading failure results in just a warning. + // Make it a fatal error. + // + eh.handle ("test.xsd", 0, 0, + xsd::cxx::tree::error_handler<char>::severity::fatal, + "unable to load schema"); + } + + eh.throw_if_failed<xml_schema::parsing> (); conf->setParameter (XMLUni::fgXercesUseCachedGrammarInParse, true); } else @@ -132,7 +142,14 @@ parsing (const char* file, unsigned long iter, bool validate) parser->setFeature (XMLUni::fgXercesSchema, true); parser->setFeature (XMLUni::fgXercesSchemaFullChecking, false); - parser->loadGrammar ("test.xsd", Grammar::SchemaGrammarType, true); + if (!parser->loadGrammar ("test.xsd", Grammar::SchemaGrammarType, true)) + { + eh.handle ("test.xsd", 0, 0, + xsd::cxx::tree::error_handler<char>::severity::fatal, + "unable to load schema"); + } + + eh.throw_if_failed<xml_schema::parsing> (); parser->setFeature (XMLUni::fgXercesUseCachedGrammarInParse, true); } else |