Changeset 227 for Xml/Validator/Backend/OmeValidator.py

Timestamp:

11/20/08 15:37:01 (7 weeks ago)

Author:

andrew

Message:

Updated to also check 2008-09-V1 schema

Files:

• Xml/Validator/Backend/OmeValidator.py (modified) (7 diffs)

Xml/Validator/Backend/OmeValidator.py

@@ -276 +276 @@
 
         def checkOldSchemas(self, inDocument):
-                for thePossibleSchema in [["ome-2008-02-V2.xsd","February 2008 V2"],["ome-2008-02-V1.xsd","February 2008 V1"],["ome-2007-06-V2.xsd","September 2007 V2"],["ome-2007-06-V1.xsd","June 2007 V1"],["ome-fc-tiff.xsd","2003 - Tiff Variant"], ["ome-fc.xsd","2003 - Standard version"]]:
+                for thePossibleSchema in [["ome-2008-09-V1.xsd","September 2008 V1"],["ome-2008-02-V2.xsd","February 2008 V2"],["ome-2008-02-V1.xsd","February 2008 V1"],["ome-2007-06-V2.xsd","September 2007 V2"],["ome-2007-06-V1.xsd","June 2007 V1"],["ome-fc-tiff.xsd","2003 - Tiff Variant"], ["ome-fc.xsd","2003 - Standard version"]]:
                         # skip current one
                         if not thePossibleSchema[0] == self.theSchemaFile:
@@ -284 +284 @@
                                 except:
                                         # chosen schema failed to laod
-                                        self.errorList.append(ParseMessage(None, None, None, "XSD", None, "Validator Internal error: XSD schema file could not be found"))
+                                        self.errorList.append(ParseMessage(None, None, None, schemaFilePath(thePossibleSchema[0]), None, "Validator Internal error: XSD schema file could not be found [2]"))
                                 # try validation
                                 try:
@@ -298 +298 @@
                 # choose the schema source
                 # assume the new schema
-                self.theSchemaFile = "ome-2008-02-V2.xsd"
+                self.theSchemaFile = "ome-2008-09-V1.xsd"
                 # if old schema
                 if self.theNamespace == "http://www.openmicroscopy.org/XMLschemas/OME/FC/ome.xsd":
@@ -312 +312 @@
                                 # use September 2007 schema
                                 self.theSchemaFile = "ome-2007-06-V2.xsd"
+                        else:
+                                if self.theNamespace == "http://www.openmicroscopy.org/Schemas/OME/2008-02":
+                                        # use February 2007 schema
+                                        self.theSchemaFile = "ome-2008-02-V2.xsd"
 
                 
@@ -319 +323 @@
                 except:
                         # chosen schema failed to laod
-                        self.errorList.append(ParseMessage(None, None, None, "XSD", None, "Validator Internal error: XSD schema file could not be found"))
+                        self.errorList.append(ParseMessage(None, None, None, "XSD", None, "Validator Internal error: XSD schema file could not be found [1]"))
                         schema = None;
                         
@@ -773 +777 @@
 if __name__ == '__main__':
         for aFilename in ["samples/completesamplenopre.xml","samples/completesample.xml","samples/completesamplenoenc.xml",
-                        "samples/sdub.ome", "samples/sdub-fix.ome", "samples/sdub-fix-pre.ome", 
-                        "samples/tiny.ome", "samples/broke.ome",
-                        "samples/tiny2008-02-V1.ome"]:
+                        "samples/sdub.ome", "samples/sdub-fix.ome", "samples/sdub-fix-pre.ome", 
+                        "samples/tiny.ome", "samples/broke.ome",
+                        "samples/tiny2008-02-V1.ome", "samples/tiny2008-09-V1.ome"]:
                         print "============ XML file %s ============ " % aFilename
                         print XmlReport.validateFile(aFilename)
@@ -787 +791 @@
         
         print "============"
+
+###