mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work around an issue regarding exceptions thrown within Xerces

metadata
Wenzel Jakob 2010-09-21 03:10:49 +02:00
parent ef55697dd9
commit b5903a1425
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/converter/converter.cpp
View File

@ -44,18 +44,15 @@ public:
inline ImporterDOMErrorHandler() { } inline ImporterDOMErrorHandler() { }
bool handleError(const DOMError& domError) { bool handleError(const DOMError& domError) {
ELogLevel logLevel; SLog(EWarn, "%s (line %i, char %i): %s",
if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING)
logLevel = EWarn;
else
logLevel = EError;
SLog(logLevel, "%s (line %i, char %i): %s",
XMLString::transcode(domError.getLocation()->getURI()), XMLString::transcode(domError.getLocation()->getURI()),
domError.getLocation()->getLineNumber(), domError.getLocation()->getLineNumber(),
domError.getLocation()->getColumnNumber(), domError.getLocation()->getColumnNumber(),
XMLString::transcode(domError.getMessage())); XMLString::transcode(domError.getMessage()));
if (domError.getSeverity() != DOMError::DOM_SEVERITY_WARNING)
SLog(EError, "Encountered a critical DOM error -- giving up!");
return true; return true;
} }
}; };
@ -181,6 +178,8 @@ void GeometryConverter::convert(const fs::path &inputFile,
Wrapper4InputSource *wrapper = new Wrapper4InputSource(memBufIS, false); Wrapper4InputSource *wrapper = new Wrapper4InputSource(memBufIS, false);
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc = parser->parse(wrapper); XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc = parser->parse(wrapper);
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *adj = parser->parseURI(adjustmentFile.file_string().c_str()); XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *adj = parser->parseURI(adjustmentFile.file_string().c_str());
if (adj == NULL)
SLog(EError, "Could not parse adjustments file!");
std::set<std::string> removals, emptyList; std::set<std::string> removals, emptyList;
cleanupPass(adj, emptyList); cleanupPass(adj, emptyList);