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

Timestamp:

09/19/07 13:52:48 (14 months ago)

Author:

andrew

Message:

Applied Version 2 - September 2007 changes to schema and improved Tiff chacks in validator

Files:

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

Xml/Validator/Backend/OmeValidator.py

@@ -238 +238 @@
                 # create an IO string for the xml string provided
                 stringXml = StringIO(self.theDom.toxml())
+                
+                #
+                print self.theDom.toprettyxml()
+                
                 # building the document tree from the input xml
                 try:
@@ -440 +444 @@
                     pass
                 
+                self.isOmeTiffConsistent = True
+                
                 # compare with values from xml and tiff
                 if self.tiffFileFrames > self.ome5dPlaneCount:
@@ -454 +460 @@
                 if self.tiffFileFrames < totalTiffDataFrames:
                         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):