Changeset 987 for CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py

Timestamp:

26/04/17 10:18:46 (3 years ago)

Author:

mjuckes

Message:

minor adjust to dreq.py to make configOnly option work smoothly

File:

• CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py (modified) (3 diffs)

CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py

@@ -475 +475 @@
     self.configOnly = configOnly
     self.coll = {}
+    self.recordAttributeDefn = {}
 
     self.nts = collections.namedtuple( 'sectdef', ['tag','label','title','id','itemLabelMode','level','maxOccurs','labUnique','uid','description'] )
@@ -534 +535 @@
     self.etree = False
     self.etree = True
-    if self.etree:
-      import xml.etree.cElementTree as cel
+    self.ns = None
+    if not self.configOnly:
+      if self.etree:
+        import xml.etree.cElementTree as cel
       
-      if not pythonPre27:
-        ## this for of namespace registration not available in 2.6
-        ## absence of registration means module cannot write data exactly as read.
-        ##
-        cel.register_namespace('', "urn:w3id.org:cmip6.dreq.dreq:a")
-        cel.register_namespace('pav', "http://purl.org/pav/2.3")
-
-      if not self.strings:
-        if python2:
-          parser = getParser()()
-          self.contentDoc = cel.parse( self.vsamp, parser=parser )
+        if not pythonPre27:
+          ## this for of namespace registration not available in 2.6
+          ## absence of registration means module cannot write data exactly as read.
+          ##
+          cel.register_namespace('', "urn:w3id.org:cmip6.dreq.dreq:a")
+          cel.register_namespace('pav', "http://purl.org/pav/2.3")
+
+        if not self.strings:
+          if python2:
+            parser = getParser()()
+            self.contentDoc = cel.parse( self.vsamp, parser=parser )
+          else:
+            self.contentDoc = cel.parse( self.vsamp )
+
+          root = self.contentDoc.getroot()
         else:
-          self.contentDoc = cel.parse( self.vsamp )
-
-        root = self.contentDoc.getroot()
+          root = cel.fromstring(self.vsamp)
+
+        self.docs[fn] = (root, self.contentDoc)
+        bs = root.tag.split( '}' )
+        if len( bs ) > 1:
+          self.ns = bs[0] + '}'
+        else:
+          self.ns = None
+        vl = root.findall( './/{http://purl.org/pav/2.3}version' )
+        if self.version != None:
+          if vl[0].text != self.version:
+            print ('WARNING: version difference between %s [%s] and %s [%s]' % (self.docl[0][0],self.version,thisdoc,vl[0].text) )
+        else:
+          self.version = vl[0].text
+        self.parent_map = dict((c, p) for p in root.getiterator() for c in p)
       else:
-        root = cel.fromstring(self.vsamp)
-      ##bs = string.split( root.tag, '}' )
-      self.docs[fn] = (root, self.contentDoc)
-      bs = root.tag.split( '}' )
-      if len( bs ) > 1:
-        self.ns = bs[0] + '}'
-      else:
+        if self.strings:
+          self.contentDoc = xml.dom.minidom.parseString( self.vsamp  )
+        else:
+          self.contentDoc = xml.dom.minidom.parse( self.vsamp )
+
+          vl = self.contentDoc.getElementsByTagName( 'prologue' )
+          v = vl[0].getElementsByTagName( 'pav:version' )
+          self.version = v[0].firstChild.data
         self.ns = None
-      vl = root.findall( './/{http://purl.org/pav/2.3}version' )
-      if self.version != None:
-        if vl[0].text != self.version:
-          print ('WARNING: version difference between %s [%s] and %s [%s]' % (self.docl[0][0],self.version,thisdoc,vl[0].text) )
-      else:
-        self.version = vl[0].text
-      self.parent_map = dict((c, p) for p in root.getiterator() for c in p)
-    else:
-      if self.strings:
-        self.contentDoc = xml.dom.minidom.parseString( self.vsamp  )
-      else:
-        self.contentDoc = xml.dom.minidom.parse( self.vsamp )
-
-        vl = self.contentDoc.getElementsByTagName( 'prologue' )
-        v = vl[0].getElementsByTagName( 'pav:version' )
-        self.version = v[0].firstChild.data
-      self.ns = None
 
     vl = doc.getElementsByTagName( 'table' ) + doc.getElementsByTagName( 'annextable' )
@@ -641 +644 @@
         self.coll[sct].attDefn[k] = ec[k]
 
-    self.recordAttributeDefn = tables
+    for k in tables:
+      self.recordAttributeDefn[k] = tables[k]
 
     if self.configOnly: