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

Timestamp:

09/26/07 09:35:33 (16 months ago)

Author:

andrew

Message:

Now checks serial number.

Files:

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

Xml/Validator/Backend/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:
@@ -137 +137 @@
         """
         theNamespace = None
+        
+        """
+        The namespace define in the OME element of the OME-XML document
+        """
+        thePrefix = None
         
         """
@@ -240 +245 @@
                 
                 #
-                print self.theDom.toprettyxml()
+                #print self.theDom.toprettyxml()
                 
                 # building the document tree from the input xml
@@ -523 +528 @@
                                 # a prefex is being used
                                 self.thePrefix = name[:-4]
-                                print "Prefix : %s" % self.thePrefix
                                 try:
                                         self.theNamespace = attribs.getValue("xmlns" + ':' + self.thePrefix)
@@ -641 +645 @@
                         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)
                         
@@ -688 +701 @@
                                 # 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
@@ -720 +732 @@
         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)