kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: Improve Metadata error handling

Browse Source 
Report XML parse exception details.
This commit is contained in:
Chris Hennes
2022-03-13 21:00:49 -05:00
parent 2ac4e60ab5
commit 2fc9c93235
7 changed files with 103 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/App/Metadata.cpp
View File

@@ -24,6 +24,7 @@
#ifndef _PreComp_
# include <memory>
# include <sstream>
#endif
#include "Metadata.h"
@@ -55,6 +56,34 @@ using namespace App;
namespace fs = boost::filesystem;
XERCES_CPP_NAMESPACE_USE
namespace MetadataInternal {
class XMLErrorHandler : public HandlerBase {
void warning(const SAXParseException& toCatch)
{
// Don't deal with warnings at all
}
void error(const SAXParseException& toCatch)
{
std::stringstream message;
message << "Error at file \"" << StrX(toCatch.getSystemId())
<< "\", line " << toCatch.getLineNumber()
<< ", column " << toCatch.getColumnNumber()
<< "\n Message: " << StrX(toCatch.getMessage()) << std::endl;
throw Base::XMLBaseException(message.str());
}
void fatalError(const SAXParseException& toCatch)
{
std::stringstream message;
message << "Fatal error at file \"" << StrX(toCatch.getSystemId())
<< "\", line " << toCatch.getLineNumber()
<< ", column " << toCatch.getColumnNumber()
<< "\n Message: " << StrX(toCatch.getMessage()) << std::endl;
throw Base::XMLBaseException(message.str());
}
};
}
Metadata::Metadata(const fs::path& metadataFile)
{
@@ -65,7 +94,7 @@ Metadata::Metadata(const fs::path& metadataFile)
_parser->setValidationScheme(XercesDOMParser::Val_Never);
_parser->setDoNamespaces(true);
auto errHandler = std::make_unique<HandlerBase>();
auto errHandler = std::make_unique<MetadataInternal::XMLErrorHandler>();
_parser->setErrorHandler(errHandler.get());
_parser->parse(metadataFile.string().c_str());

19
src/App/MetadataPyImp.cpp
View File

@@ -29,6 +29,7 @@
#include "MetadataPy.cpp"
using namespace Base;
XERCES_CPP_NAMESPACE_USE
// Returns a string which represents the object e.g. when printed in Python
std::string MetadataPy::representation(void) const
@@ -70,6 +71,24 @@ int MetadataPy::PyInit(PyObject* args, PyObject* /*kwd*/)
setTwinPointer(md);
return 0;
}
catch (const Base::XMLBaseException& e) {
PyErr_SetString(Base::BaseExceptionFreeCADError, e.what());
return -1;
}
catch (const XMLException& toCatch) {
char* message = XMLString::transcode(toCatch.getMessage());
std::string what = message;
XMLString::release(&message);
PyErr_SetString(Base::BaseExceptionFreeCADError, what.c_str());
return -1;
}
catch (const DOMException& toCatch) {
char* message = XMLString::transcode(toCatch.getMessage());
std::string what = message;
XMLString::release(&message);
PyErr_SetString(Base::BaseExceptionFreeCADError, what.c_str());
return -1;
}
catch (...) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Failed to create Metadata object");
return -1;