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

Timestamp:

09/14/07 11:07:40 (14 months ago)

Author:

andrew

Message:

Added tiff checks and code from web validator to load schema based on config file.

Files:

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

Xml/Validator/Backend/OmeValidator.py

@@ -25 +25 @@
 from stat import *
 
+"""
+# Load schemas from configured directory 
+import cherrypy
+# LocalDir for schemas
+SCHEMA_DIR = cherrypy.config.get("validator.schema", os.path.join(os.getcwd(),"schema"))
+def schemaFilePath(inFilename):
+        return os.path.join(os.getcwd(), SCHEMA_DIR, inFilename)
+"""
+# Load schemas from current directory 
+def schemaFilePath(inFilename):
+        return inFilename
+
 # Try to load Image for XML Schema Vlaidation Support
 haveTiffSupport = True
@@ -161 +173 @@
                 # build the blank dom
                 self.theDom = None
-        
         
         def __str__(self):
@@ -212 +223 @@
                 self.validateAgainstSchema()
                 
+                if len(self.unresolvedList) is not 0 :
+                        self.hasUnresolvableIds = True
+                
                 if self.isXsdValid is True and len(self.errorList) is 0 :
                         self.isOmeXml = True
@@ -257 +271 @@
                 # loading the OME schema to validate against
                 try:
-                        schema = etree.XMLSchema(etree.parse(theSchemaFile))
+                        schema = etree.XMLSchema(etree.parse(schemaFilePath(theSchemaFile)))
                 except:
                         #chosen scema failed to laod
@@ -277 +291 @@
                 try:
                         sax.parse(inFile, handlerContent, handlerError)
+                        self.hasCustomAttributes = handlerContent.hasCustomAttributes;
                 except  sax.SAXParseException:
                         self.errorList.append(ParseMessage(None, None, None, "XmlError",None, "Parsing of XML failed"))
@@ -375 +390 @@
                                         # create a file object to represent the xml string
                                         theFileString = StringIO(theXml)
-                                        # print theXml
-                                        
                                         # parse the new string/file object into the report and validate it 
                                         theTiffReport.parse(theFileString)
                                         theTiffReport.validateTiffImageData(image)
                                         """
+                                        # print theXml
                                         print "Tiff Frames    : %s" % theTiffReport.tiffFileFrames      
                                         print "Ome Frames     : %s" % theTiffReport.omeTiffDataCount    
@@ -486 +500 @@
                 self.omeTiffDataPlaneCount = 0
                 self.theAllFrameCount = 0
+                self.hasCustomAttributes = False
                 
                 # Setup the DOM chunk
@@ -511 +526 @@
                                 except KeyError:
                                         self.theNamespace = ""
+                        
+                # save the ID in any elements encountered
+                if name[-16:] == "CustomAttributes":
+                        self.hasCustomAttributes = True
                         
                 # save the ID in any elements encountered
@@ -570 +589 @@
                 if name[-8:] == "TiffData":
                         self.omeTiffDataCount = self.omeTiffDataCount + 1
-                        # omeTiffDataPlaneCount
+                        # record the number of planes used by the TiffData block
                         if "NumPlanes" in attribs:
                                 # use the number of planes specified
@@ -685 +704 @@
 
 if __name__ == '__main__':
-        """     for aFilename in ["samples/completesamplenopre.xml","samples/completesample.xml","samples/completesamplenoenc.xml",
+        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"]:
                         print "============ XML file %s ============ " % aFilename
                         print XmlReport.validateFile(aFilename)
-        """
+        
         
         for aFilename in ["samples/4d2wOME.tif", "samples/4d2wOME-fixed.tif",