Changeset 361 for CMIP6dreqbuild/trunk/src

Timestamp:

30/07/15 10:37:13 (7 years ago)

Author:

mjuckes

Message:

more updates

Location:

CMIP6dreqbuild/trunk/src

Files:

• framework/dreq.py (modified) (3 diffs)
• framework/ptxt.py (modified) (9 diffs)
• workbook/importShDreq.py (modified) (8 diffs)

CMIP6dreqbuild/trunk/src/framework/dreq.py

@@ -15 +15 @@
            self.mdInit( xmlMiniDom )
 
-
        def dictInit( self, dict ):
          for a in self.attributes:
@@ -31 +30 @@
            else:
              self.__dict__[a] = self.defaults.get( a, self.globalDefault )
-        
 
 class config(object):
 
   def __init__(self):
-    self.vdef = 'out/parVocabDefn.xml' 
+    self.vdef = 'out/dreqDefn.xml' 
     self.vsamp = 'out/vocabSample.xml'
     self.vsamp = '../workbook/trial.xml'
     self.vsamp = '../workbook/trial_20150724.xml'
     self.nts = collections.namedtuple( 'sectdef', ['tag','label','title','id','itemLabelMode'] )
-    self.nti = collections.namedtuple( 'itemdef', ['tag','label','title','type'] )
+    self.nti = collections.namedtuple( 'itemdef', ['tag','label','title','type','rClass','techNote'] )
     self.ntt = collections.namedtuple( 'sect', ['header','attributes'] )
 
@@ -127 +125 @@
       else:
         ty = "xs:string"
-      return self.nti( i.nodeName, l,t,ty )
+      if i.hasAttribute( 'class' ):
+        cls = i.getAttribute( 'class' )
+      else:
+        cls = None
+      if i.hasAttribute( 'techNote' ):
+        tn = i.getAttribute( 'techNote' )
+      else:
+        tn = None
+      return self.nti( i.nodeName, l,t,ty,cls,tn )
 
 c = config()

CMIP6dreqbuild/trunk/src/framework/ptxt.py

@@ -4 +4 @@
 ptxt.py [-f srcFile] [samp|defn]
 '''
-import string, re, collections, sys
+import string, re, collections, sys, uuid
 
 if len(sys.argv) == 1:
@@ -27 +27 @@
 re_atdef = re.compile( '^(?P<n>\S+)\s*((\[(?P<b>.*?)\]|\{(?P<a>.*?)\}|\<(?P<c>.*?)\>)\s*){0,3}$' )
 
-nt__itematt = collections.namedtuple( 'itematt', ['name','type','title','clss'] )
+### tuble to define attributes of an item
+nt__itematt = collections.namedtuple( 'itematt', ['name','type','title','clss','techn'] )
 
 vocab_elTmpl = '''<table label="%(label)s" title="%(title)s" id="%(id)s" itemLabelMode="%(ilm)s">
@@ -33 +34 @@
 </table>
 '''
-ial_elTmpl = '  <rowAttribute label="%(label)s"%(wrappedType)s%(wrappedTitle)s%(wrappedClass)s/>'
+ial_elTmpl = '  <rowAttribute label="%(label)s"%(wrappedType)s%(wrappedTitle)s%(wrappedClass)s%(wrappedTechn)s/>'
 
 expl_Tmpl = '''<%(label)s class="vocab" title="%(title)s" id="%(id)s">
@@ -54 +55 @@
      self.kk = kk
      self.msg( '[%s] %s {%s:%s}' % (self.label, self.title, self.id, self.ilt) )
-     self.itematts = [  nt__itematt( 'label','xs:string',None,None ),
-                        nt__itematt( 'title','xs:string',None,None ) ]
+     self.itematts = [  nt__itematt( 'label','xs:string',None,None,None ),
+                        nt__itematt( 'title','xs:string',None,None,None ) ]
 
   def tmpl(self,oo=None,mode="defn"):
@@ -61 +62 @@
        ss = []
        for i in self.itematts:
-         print i
          if i.clss != None:
            wrappedClass = ' class="%s"' % i.clss
          else:
            wrappedClass = ''
+
+         if i.techn != None:
+           wrappedTechn = ' techNote="%s"' % i.techn
+         else:
+           wrappedTechn = ''
 
          if i.title != None:
@@ -102 +107 @@
            value = "noType"
            if i.type == "xs:string":
-             value = 'dummyAt'
+             if i.name == 'uuid':
+               value = str( uuid.uuid1() )
+             else:
+               value = 'dummyAt'
            elif i.type == "xs:integer":
              value = '25'
@@ -132 +140 @@
      bits = map( string.strip, string.split(line[3:], ';' ) )
      for b in bits:
-       bn = string.split(b, ' ')[0]
-       x = self.pb(b)
-       self.itematts.append( nt__itematt( bn, x[0], x[1], x[2] ) )
-       self.msg( '%s, %s, %s, %s' % (bn, x[0], x[1], x[2]) )
+       if string.strip(b) != '':
+         bn = string.split(b, ' ')[0]
+         x = self.pb(b)
+         self.itematts.append( nt__itematt( bn, x[0], x[1], x[2], x[3] ) )
+         self.msg( '%s, %s, %s, %s, %s' % (bn, x[0], x[1], x[2], x[3]) )
 
   def pb(self, b):
@@ -151 +160 @@
       itemType = ee['b']
       itemClass = ee['c']
+      itemTechNote = None
       if itemType == None:
          itemType = 'xs:string'
+      if type(itemClass) == type('x'):
+        if string.find(itemClass, '|' ) != -1:
+          bits = string.split( itemClass, '|' )
+          assert len(bits) == 2, 'ERROR.001.0001: failed to parse attribute definition: %s' % b
+          itemClass = bits[0]
+          itemTechNote = bits[1]
         
     #if len(x) > 0:
@@ -163 +179 @@
     #else:
       #itemType = 'xs:string'
-    return [itemType, itemTitle,itemClass] 
+    return [itemType, itemTitle,itemClass,itemTechNote] 
 
 class main(object):

CMIP6dreqbuild/trunk/src/workbook/importShDreq.py

@@ -1 +1 @@
 """Import data request from shelves and put onto compliant XML document.
 ------------------------------------------------------------------------
-A new uuid is generatd for elements of the "revisedtabitem" section/table (because it is not present in the shelve).
+A new uuid is generated for elements of the "revisedtabitem" section/table (because it is not present in the shelve).
 
 NOTES
@@ -34 +34 @@
     self.src=src
     self.repl = collections.defaultdict( list )
+    self.err0010 = collections.defaultdict( int )
     self.replItems = {}
     self.importRepl()
@@ -64 +65 @@
     print xsn
     print ff.keys()
-
+    
+    self.eern = collections.defaultdict( list )
+    self.eern2 = {}
+    ixrn = 5
+    dups = []
+    for k in rq.rqvg.keys():
+      if k[0] != '_':
+        kk = ['uid', 'mip', 'tab', 'objective', 'grid', 'gridreq', 'comment', 'ref', 'refNote', 'refid']
+        kk = ['uuid', 'mip', 'label', 'title', 'ref', 'refNote']
+        i = rq.rqvg[k]
+        
+        self.eern[i[ixrn]].append( i[0] )
+        k2 = '%s__%s' % (i[ixrn-1],i[ixrn])
+        if self.eern2.has_key( k2 ):
+           dups.append( k2 )
+        self.eern2[k2] = i[0]
+        assert i[0] == k, 'Bad key/uuid'
+
+    assert len( dups ) == 0, 'Duplicate refs: %s' % str(dups)
+        
     for k in [ 'var','ovar','groupitem', 'revisedtabitem', 'requestlink', 'requestitem','requestvargroup' ]:
     ##for k in [ 'var']:
@@ -165 +185 @@
 ## - table; mip; uuid; priority
             kk = ['var', 'table', 'mip', 'vid', 'priority']
+            kvg = 'rev__%s.%s' % ( ll[2],ll[1] )
+            if self.eern2.has_key(kvg):
+              vgid = self.eern2[kvg]
+            else:
+              vgid = '__none__'
+              self.err0010[kvg] += 1
             thisuuid = str( uuid.uuid1() )
             thisl = string.strip(str( ll[0] ) )
@@ -172 +198 @@
             item.setAttribute( 'title', thisl )
             item.setAttribute( 'uuid', thisuuid )
+            item.setAttribute( 'vgid', vgid )
             if self.insert.has_key(thisl):
                 thisold = item.getAttribute( 'vid' )
@@ -193 +220 @@
             thisl = string.strip(str( '%s-%s-%s' % (ll[0],ll[1],ll[2]) ) )
             for j in range(len(kk)):
-                item.setAttribute( kk[j], str( ll[j] ) )
+                if kk[j] == 'ny':
+                  thisv = str( int(ll[j]) )
+                else:
+                  thisv = str( ll[j] )
+                item.setAttribute( kk[j], thisv )
             item.setAttribute( 'title', '%s, %s, %s' % (ll[0],ll[1],ll[2]) )
             item.setAttribute( 'uuid', str(i) )
@@ -199 +230 @@
           elif k == 'requestvargroup':
             kk = ['uuid', 'mip', 'label', 'title', 'ref', 'refNote']
+            thisl = string.replace( str( ll[2] ), '.', '-' )
             for j in range(len(kk)):
                 item.setAttribute( kk[j], str( ll[j] ) )
@@ -270 +302 @@
          self.insert[bits[1]] = bits[3]
 
-sampleXml = '../framework/out/parVocabSample.xml'
+sampleXml = '../framework/out/dreqSample.xml'
 from scansh import rq
 m = main(sampleXml, rq)