Changeset 119

Timestamp:

10/31/07 10:59:01 (10 months ago)

Author:

andrew

Message:

Added block to catch exception from XML parser.

Location:

Xml/Validator

Files:

• Backend/OmeValidator.py (modified) (1 diff)
• Backend/ValidatorBackend.tmproj (modified) (2 diffs)
• WebApp/validator/OmeValidator.py (modified) (1 diff)

Xml/Validator/Backend/OmeValidator.py

@@ -255 +255 @@
                 
                 # validating the documnet tree against the loaded schema
-                # this should not throw an exception
-                schema.validate(document)
-                err = schema.error_log.last_error
-                if err:
+                # according to the docs this should not throw an exception - but it does!
+                try:
+                        schema.validate(document)
+                        err = schema.error_log.last_error
+                        if err:
+                                self.isXsdValid = False
+                                self.errorList.append(ParseMessage(None, err.line, None, "XSD", None, err.message))
+                        else:
+                                self.isXsdValid = True
+                except XMLSchemaValidateError:
                         self.isXsdValid = False
-                        self.errorList.append(ParseMessage(None, err.line, None, "XSD", None, err.message))
-                else:
-                        self.isXsdValid = True
+                        self.errorList.append(ParseMessage(None, None, None, "XML", None, "Internal error in the system XML Schema validation module"))
+                        
         
         def loadChoosenSchema(self):

Xml/Validator/Backend/ValidatorBackend.tmproj

@@ -22 +22 @@
                         <key>lastUsed</key>
                         <date>2007-10-16T18:37:26Z</date>
-                        <key>selected</key>
-                        <true/>
                 </dict>
                 <dict>
@@ -29 +27 @@
                         <string>OmeValidator.py</string>
                         <key>lastUsed</key>
-                        <date>2007-10-16T18:37:24Z</date>
+                        <date>2007-10-26T16:09:53Z</date>
+                        <key>selected</key>
+                        <true/>
                 </dict>
                 <dict>

Xml/Validator/WebApp/validator/OmeValidator.py

@@ -256 +256 @@
                 # validating the documnet tree against the loaded schema
                 # this should not throw an exception
-                schema.validate(document)
-                err = schema.error_log.last_error
-                if err:
+                try:
+                        schema.validate(document)
+                        err = schema.error_log.last_error
+                        if err:
+                                self.isXsdValid = False
+                                self.errorList.append(ParseMessage(None, err.line, None, "XSD", None, err.message))
+                        else:
+                                self.isXsdValid = True
+                except XMLSchemaValidateError:
                         self.isXsdValid = False
-                        self.errorList.append(ParseMessage(None, err.line, None, "XSD", None, err.message))
-                else:
-                        self.isXsdValid = True
+                        self.errorList.append(ParseMessage(None, None, None, "XML", None, "Internal error in the system XML Schema validation module"))
+                        
         
         def loadChoosenSchema(self):