improving xerces error message fix #7264

Author: behrisch

src/utils/xml/GenericSAXHandler.cpp

@@ -204,12 +204,24 @@ GenericSAXHandler::convertTag(const std::string& tag) const {
 std::string
 GenericSAXHandler::buildErrorMessage(const XERCES_CPP_NAMESPACE::SAXParseException& exception) {
     std::ostringstream buf;
-    char* pMsg = XERCES_CPP_NAMESPACE::XMLString::transcode(exception.getMessage());
-    buf << pMsg << std::endl;
-    buf << TL(" In file '") << getFileName() << "'" << std::endl;
+    const XMLCh* const sysId = exception.getSystemId();
+    if (sysId != nullptr) {
+        const std::string url = StringUtils::transcode(sysId);
+        if (StringUtils::startsWith(url, "http:") || StringUtils::startsWith(url, "https:")) {
+            buf << "Failed to read " << url << ".\n";
+        }
+    }
+    if (StringUtils::transcode(exception.getMessage()).find("NetAccessor") != std::string::npos) {
+        buf << "No network access.\n";
+    }
+    if (buf.tellp() == 0) {
+        char* pMsg = XERCES_CPP_NAMESPACE::XMLString::transcode(exception.getMessage());
+        buf << pMsg << "\n";
+        XERCES_CPP_NAMESPACE::XMLString::release(&pMsg);
+    }
+    buf << TL(" In file '") << getFileName() << "'\n";
     buf << TL(" At line/column ") << exception.getLineNumber() + 1
-        << '/' << exception.getColumnNumber() << "." << std::endl;
-    XERCES_CPP_NAMESPACE::XMLString::release(&pMsg);
+        << '/' << exception.getColumnNumber() << ".\n";
     return buf.str();
 }
 

src/utils/xml/GenericSAXHandler.h

@@ -198,7 +198,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
     void fatalError(const XERCES_CPP_NAMESPACE::SAXParseException& exception);
     //@}
 
-
     void setSection(const int element, const bool seen) {
         mySection = element;
         mySectionSeen = seen;
@@ -224,7 +223,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
     // Reader needs access to myStartElement, myEndElement
     friend class SUMOSAXReader;
 
-
 protected:
     /**
      * @brief Builds an error message
@@ -237,7 +235,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
      */
     std::string buildErrorMessage(const XERCES_CPP_NAMESPACE::SAXParseException& exception);
 
-
     /**
      * @brief Callback method for an opening tag to implement by derived classes
      *
@@ -249,7 +246,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
     virtual void myStartElement(int element,
                                 const SUMOSAXAttributes& attrs);
 
-
     /**
      * @brief Callback method for characters to implement by derived classes
      *
@@ -261,7 +257,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
     virtual void myCharacters(int element,
                               const std::string& chars);
 
-
     /** @brief Callback method for a closing tag to implement by derived classes
      *
      * Called by "endElement" (see there).
@@ -283,7 +278,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
      */
     XMLCh* convert(const std::string& name) const;
 
-
     /**
      * @brief Converts a tag from its string into its numerical representation
      *
@@ -294,7 +288,6 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
      */
     int convertTag(const std::string& tag) const;
 
-
 private:
     /// @name attributes parsing
     //@{
@@ -355,6 +348,7 @@ class GenericSAXHandler : public XERCES_CPP_NAMESPACE::DefaultHandler {
 
     std::pair<int, SUMOSAXAttributes*> myNextSectionStart;
 
+
 private:
     /// @brief invalidated copy constructor
     GenericSAXHandler(const GenericSAXHandler& s);