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

Timestamp:

08/17/07 15:28:32 (15 months ago)

Author:

andrew

Message:

Updated to handle namespace prefix for OME element

Files:

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

Xml/Validator/Backend/OmeValidator.py

@@ -401 +401 @@
                 '''
                 # pull the namespace out of the OME element
-                if name[-3] == "OME":
-                        try:
-                                self.theNamespace = attribs.getValue("xmlns")
-                        except KeyError:
-                                self.theNamespace = ""
+                if name[-3:] == "OME":
+                        if name[-4:] == ":OME":
+                                # a prefex is being used
+                                self.thePrefix = name[:-4]
+                                print "Prefix : %s" % self.thePrefix
+                                try:
+                                        self.theNamespace = attribs.getValue("xmlns" + ':' + self.thePrefix)
+                                except KeyError:
+                                        self.theNamespace = ""
+                        else:
+                                try:
+                                        self.theNamespace = attribs.getValue("xmlns")
+                                except KeyError:
+                                        self.theNamespace = ""
                         
                 # save the ID in any elements encountered
@@ -500 +509 @@
                 self.theNamespace = None
         
-        def startElement(self, name, attrs):
+        def startElement(self, name, attribs):
                 '''
                 Examine each element in turn and check of the main OME element
                 '''
-                if name == "OME":
-                        try:
-                                # pull the namespace out of the OME element
-                                self.theNamespace = attrs["xmlns"]
-                        except KeyError:
-                                # assume default namespace
-                                self.theNamespace = ""
+                # pull the namespace out of the OME element
+                if name[-3:] == "OME":
+                        if name[-4:] == ":OME":
+                                # 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
+                                        self.theNamespace = attribs.getValue("xmlns" + ':' + self.thePrefix)
+                                except KeyError:
+                                        # assume default namespace
+                                        self.theNamespace = ""
+                        else:
+                                try:
+                                        # pull the namespace out of the OME element
+                                        self.theNamespace = attribs.getValue("xmlns")
+                                except KeyError:
+                                        self.theNamespace = ""
                         #finally:
                                 # the OME node has been found (even if it does not have a