Changeset 130 for Xml/Validator/WebApp/validator/OmeValidator.py

Timestamp:

01/09/08 10:55:14 (11 months ago)

Author:

andrew

Message:

Updated to report multiple errors not just the last.
Updated error message used if the system xml validator generates an error.

Files:

• Xml/Validator/WebApp/validator/OmeValidator.py (modified) (6 diffs)

Xml/Validator/WebApp/validator/OmeValidator.py

@@ -37 +37 @@
         return inFilename
 """
-# Try to load Image for XML Schema Vlaidation Support
+# Try to load Image for Tiff Support
 haveTiffSupport = True
 try:
@@ -45 +45 @@
         haveTiffSupport = False
 
-# Try to load lxml for XML Schema Vlaidation Support
+# Try to load lxml for XML Schema Validation Support
 haveXsdSupport = True
 try:
@@ -221 +221 @@
                 # mark xlm as having been parsed
                 self.hasParsedXml = True
-                
+
                 # look at file for Ids, Refs, and namespaces
                 self.scanForIdsAndNamespace(inFile)
@@ -233 +233 @@
                 if self.isXsdValid is True and len(self.errorList) is 0 :
                         self.isOmeXml = True
-                                
+        
         def validateAgainstSchema(self):
                 if not haveXsdSupport:
@@ -255 +255 @@
                 
                 # validating the documnet tree against the loaded schema
-                # this should not throw an exception
+                # 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 = True
+                        for err in schema.error_log:
                                 self.isXsdValid = False
                                 self.errorList.append(ParseMessage(None, err.line, None, "XSD", None, err.message))
-                        else:
-                                self.isXsdValid = True
                 except etree.XMLSchemaValidateError:
                         self.isXsdValid = False
-                        self.errorList.append(ParseMessage(None, None, None, "XML", None, "Internal error in the system XML Schema validation module"))
+                        self.errorList.append(ParseMessage(None, None, None, "XML", None, "Processing the XML data has generated an unspecified error in the XML sub-system. This is usually a result of an incorrect top level block. Please check the OME block is well-formed and that the schemaLocation is specified correctly. This may also be caused by a missing namespace prefix or incorrect xmlns attribute."))
                         
         
@@ -471 +469 @@
                         self.errorList.append(ParseMessage(None, None, None, "TIFF", ("Frames %s out of %s" % (self.tiffFileFrames,totalTiffDataFrames)) , "Not all required frames are present in this Tiff file"))
                         self.isOmeTiffConsistent = False
-
+                
 # Used by sax parser to handle errors when processing Elements
 class ParseErrorHandler(sax.ErrorHandler):