Changeset 158

Timestamp:

02/28/08 14:27:44 (6 months ago)

Author:

andrew

Message:

Changes to validator for February 2008 Schema Version 1

Location:

Xml/Validator

Files:

• Backend/OmeValidator.py (modified) (5 diffs)
• Backend/ome-2007-06-V1.xsd (moved) (moved from Xml/Validator/Backend/ome-2007-07-V1.xsd)
• Backend/ome-2007-06-V2.xsd (moved) (moved from Xml/Validator/Backend/ome-2007-07-V2.xsd)
• Backend/ome-2007-06.xsd (moved) (moved from Xml/Validator/Backend/ome-2007-07.xsd)
• Backend/ome-2008-02-V1.xsd (added)
• Validator - Back & Front.tmproj (modified) (2 diffs)
• WebApp/schema/ome-2007-06-V1.xsd (moved) (moved from Xml/Validator/WebApp/schema/ome-2007-07-V1.xsd)
• WebApp/schema/ome-2007-06-V2.xsd (moved) (moved from Xml/Validator/WebApp/schema/ome-2007-07-V2.xsd)
• WebApp/schema/ome-2007-06.xsd (moved) (moved from Xml/Validator/WebApp/schema/ome-2007-07.xsd)
• WebApp/schema/ome-2008-02-V1.xsd (added)
• WebApp/validator/OmeValidator.py (modified) (5 diffs)

Xml/Validator/Backend/OmeValidator.py

@@ -274 +274 @@
                         self.isXsdValid = False
                         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."))
-        
+
         def checkOldSchemas(self, inDocument):
-                for thePossibleSchema in [["ome-2007-07-V2.xsd","September 2007 V2"],["ome-2007-07-V1.xsd","June 2007 V1"],["ome-fc-tiff.xsd","2003 - Tiff Variant"], ["ome-fc.xsd","2003 - Standard version"]]:
+                for thePossibleSchema in [["ome-2008-02-V1.xsd","February 2008 V2"],["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:
@@ -298 +298 @@
                 # choose the schema source
                 # assume the new schema
-                self.theSchemaFile = "ome-2007-07-V2.xsd"
+                self.theSchemaFile = "ome-2008-02-V1.xsd"
                 # if old schema
                 if self.theNamespace == "http://www.openmicroscopy.org/XMLschemas/OME/FC/ome.xsd":
@@ -308 +308 @@
                                 # use normal version of old schema
                                 self.theSchemaFile = "ome-fc.xsd"
+                else:
+                        if self.theNamespace == "http://www.openmicroscopy.org/Schemas/OME/2007-06":
+                                # use September 2007 schema
+                                self.theSchemaFile = "ome-2007-06-V2.xsd"
+
                 
                 # loading the OME schema to validate against
@@ -598 +603 @@
                                         if name[-5:] == "Image":
                                                 try:
-                                                        # in Image - ID is an ID and DefaultPixels is a Reference
+                                                        # in Image - ID is an ID 
+                                                        # and DefaultPixels is a Reference
                                                         self.references.append(attribs.getValue("DefaultPixels"))
+                                                except KeyError:
+                                                        pass
+                                                try:
+                                                        # and AcquiredPixels is a Reference
+                                                        self.references.append(attribs.getValue("AcquiredPixels"))
                                                 except KeyError:
                                                         pass
@@ -757 +768 @@
         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/tiny.ome", "samples/broke.ome",
+                        "samples/tiny2008-02-V1.ome"]:
                         print "============ XML file %s ============ " % aFilename
                         print XmlReport.validateFile(aFilename)

Xml/Validator/Validator - Back & Front.tmproj

@@ -17 +17 @@
         </array>
         <key>fileHierarchyDrawerWidth</key>
-        <integer>200</integer>
+        <integer>219</integer>
         <key>metaData</key>
         <dict/>
@@ -23 +23 @@
         <true/>
         <key>windowFrame</key>
-        <string>{{194, 156}, {1041, 828}}</string>
+        <string>{{0, 49}, {1367, 1129}}</string>
 </dict>
 </plist>

Xml/Validator/WebApp/validator/OmeValidator.py

@@ -274 +274 @@
                         self.isXsdValid = False
                         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."))
-        
+
         def checkOldSchemas(self, inDocument):
-                for thePossibleSchema in [["ome-2007-07-V2.xsd","September 2007 V2"],["ome-2007-07-V1.xsd","June 2007 V1"],["ome-fc-tiff.xsd","2003 - Tiff Variant"], ["ome-fc.xsd","2003 - Standard version"]]:
+                for thePossibleSchema in [["ome-2008-02-V1.xsd","February 2008 V2"],["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:
@@ -298 +298 @@
                 # choose the schema source
                 # assume the new schema
-                self.theSchemaFile = "ome-2007-07-V2.xsd"
+                self.theSchemaFile = "ome-2008-02-V1.xsd"
                 # if old schema
                 if self.theNamespace == "http://www.openmicroscopy.org/XMLschemas/OME/FC/ome.xsd":
@@ -308 +308 @@
                                 # use normal version of old schema
                                 self.theSchemaFile = "ome-fc.xsd"
+                else:
+                        if self.theNamespace == "http://www.openmicroscopy.org/Schemas/OME/2007-06":
+                                # use September 2007 schema
+                                self.theSchemaFile = "ome-2007-06-V2.xsd"
+
                 
                 # loading the OME schema to validate against
@@ -598 +603 @@
                                         if name[-5:] == "Image":
                                                 try:
-                                                        # in Image - ID is an ID and DefaultPixels is a Reference
+                                                        # in Image - ID is an ID 
+                                                        # and DefaultPixels is a Reference
                                                         self.references.append(attribs.getValue("DefaultPixels"))
+                                                except KeyError:
+                                                        pass
+                                                try:
+                                                        # and AcquiredPixels is a Reference
+                                                        self.references.append(attribs.getValue("AcquiredPixels"))
                                                 except KeyError:
                                                         pass
@@ -748 +759 @@
         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/tiny.ome", "samples/broke.ome",
+                        "samples/tiny2008-02-V1.ome"]:
                         print "============ XML file %s ============ " % aFilename
                         print XmlReport.validateFile(aFilename)