Changeset 116

Timestamp:

10/18/07 10:51:31 (10 months ago)

Author:

andrew

Message:

Changed file to use version 2 of 2007-07 schema.

Location:

Xml/Validator/WebApp

Files:

• schema/ome-2007-07-V1.xsd (added)
• schema/ome-2007-07-V2.xsd (added)
• validator/OmeValidator.py (modified) (6 diffs)

Xml/Validator/WebApp/validator/OmeValidator.py

@@ -139 +139 @@
         
         """
+        The namespace define in the OME element of the OME-XML document
+        """
+        thePrefix = None
+        
+        """
         Create the message lists for this instance of the report object
         """
@@ -262 +267 @@
                 # choose the schema source
                 # assume the new schema
-                theSchemaFile = "ome-2007-07.xsd"
+                theSchemaFile = "ome-2007-07-V2.xsd"
                 # if old schema
                 if self.theNamespace == "http://www.openmicroscopy.org/XMLschemas/OME/FC/ome.xsd":
@@ -523 +528 @@
                                 # a prefex is being used
                                 self.thePrefix = name[:-4]
-                                print "Prefix : %s" % self.thePrefix
                                 try:
                                         self.theNamespace = attribs.getValue("xmlns" + ':' + self.thePrefix)
@@ -632 +636 @@
                         self.omePlanesCount = self.omePlanesCount + 1
                 
+                if name[-12:] == "ManufactSpec":
+                        try:
+                                # look for the serial number
+                                theSerial = int(attribs.getValue("SerialNumber"))
+                        except KeyValue:
+                                pass
+                        if theSerial is None or len(theSerial) == 0:
+                                self.warningList.append(ParseMessage(None, None, None, "OME","", "Missing or empty SerialNumber in ManufactSpec"))
+                
                 self.domify(name, attribs)
                         
@@ -679 +692 @@
                                 # a prefex is being used
                                 self.thePrefix = name[:-4]
-                                print "Prefix : %s" % self.thePrefix
                                 try:
                                         # pull the namespace for prefix out of the OME element
@@ -711 +723 @@
         for aFilename in ["samples/4d2wOME.tif", "samples/4d2wOME-fixed.tif",
                 "samples/4d2wOME-fixed-updated.tif", "samples/blank.tif",
-                "samples/ome.xsd"]:
+                "samples/ome.xsd", "samples/4d2wOME-EdExtra.tif"]:
                 print "============ XML file %s ============ " % aFilename
                 print XmlReport.validateTiff(aFilename)