Changeset 143

Timestamp:

01/04/14 10:21:59 (6 years ago)

Author:

mjuckes

Message:

extended attribute mapping support to prompt for missing global attriutes

Location:

CCCC/trunk

Files:

• USAGE_amap2nco.txt (added)
• amap2nco.py (modified) (1 diff)
• c4.py (modified) (2 diffs)
• utils_c4.py (modified) (4 diffs)

CCCC/trunk/amap2nco.py

@@ -104 +104 @@
   import sys
   if len(sys.argv) != 4:
-    print """USAGE:
-python map2nco.py   mappingsFile  inputDirectoryBase outputDirectoryBase
+    if os.path.isfile( 'USAGE_amap2nco.txt' ):
+      for l in open( 'USAGE_amap2nco.txt').readlines():
+        print string.strip(l)
+    else:
+      print """USAGE:
+python amap2nco.py   mappingsFile  inputDirectoryBase outputDirectoryBase
 mappingsFile: text file containing mapping information, generated by c4.py
 inputDirectoryBase: initial part of the directory tree, to be replaced for corrected files
 outputDirectoryBase: initial part of directory tree to be used for corrected files.
 
-WARNING
-Note that this feature will only correct errors where there is an unambiguous correct value
-Users should check intermediary files to ensure that changes make sense
-
-e.g.
-## run the checking program
-python c4.py -p CORDEX -D /tmp/batch1 --ld batch1_logs
-## after checking, mv the amapDraft.txt file generated by c4.py
-mv amapDraft.txt amap_batch1.txt
-## run the checking program in 'virtual substition' mode.  If all errors are captured by the 
-## substition list generated the code will indicate that there are no remaining errors.
-python c4.py -p CORDEX -D /tmp/batch1 --ld batch1_logs  --aMap amap_batch1.txt
-
-## the "amapDraft.txt" file contains a condensed view of substistution -- the 2nd run of c4.py 
-## will create an extended list in "attributeMappingsLog.txt"
-
-## Generate a script to correct files
-python map2nco.py   attributeMappingsLog.txt /tmp/batch1 /tmp/batch1_corrected
-##
-## Run the script
-bash ncoscript.sh
-
-##
-## check the modified files
-python c4.py -p CORDEX -D /tmp/batch1_corrected --ld batch1_corrected_logs"""
+See file USAGE_amap2nco.txt in code repository for more detail"""
 
   else:

CCCC/trunk/c4.py

@@ -133 +133 @@
               self.da[m[1][0][1]][targ] = m[2][1]
               self.atMapLog.write( '@ax:"%s","%s","%s","%s","%s"\n' % (self.fpath, m[1][0][1], targ, thisval, m[2][1]) )
-        elif m[1][0][0][0] != "@":
+        elif m[1][0][0] == "@":
             this = self.ga
             apThis = True
-            for c in m[1]:
+## apply change where attribute absent only
+            for c in m[1][1:]:
               if c[0] not in this.keys():
-                apThis = False
-              elif c[1] != this[c[0]]:
+                if c[1] != '__absent__':
+                  apThis = False
+              elif c[1] == '__absent__' or c[1] != this[c[0]]:
                 apThis = False
             if m[2][0] != '':
@@ -148 +150 @@
               if log != None:
                 log.info( 'Setting %s to %s' % (targ,m[2][1]) )
-              print 'Setting %s:%s to %s' % (m[1][0][1],targ,m[2][1])
+              ##print 'Setting %s to %s' % (targ,m[2][1])
               thisval = self.ga.get( targ, None )
               self.ga[targ] = m[2][1]

CCCC/trunk/utils_c4.py

@@ -106 +106 @@
     self.messageCount = 0
     self.init()
+    if not hasattr( self.parent, 'amapListDraft' ):
+      self.parent.amapListDraft = []
 
   def isInt(self,x):
@@ -337 +339 @@
          m.append(k)
 
-    gaerr = not self.test( len(m)  == 0, 'Required global attributes missing: %s' % str(m) )
+    if not self.test( len(m)  == 0, 'Required global attributes missing: %s' % str(m) ):
+      gaerr = True
+      for k in m:
+        self.parent.amapListDraft.append( '#@;%s=%s|%s=%s' % (k,'__absent__',k,'<insert attribute value and uncomment>') )
 
     self.checkId = '002'
@@ -357 +362 @@
       if not varAts[varName].has_key(k):
          m.append(k)
-    vaerr = not self.test( len(m)  == 0, 'Required variable attributes missing: %s' % str(m) )
+    if not self.test( len(m)  == 0, 'Required variable attributes missing: %s' % str(m) ):
+      vaerr = True
+      for k in m:
+        self.parent.amapListDraft.append( '#@var=%s;%s=%s|%s=%s' % (varName,k,'__absent__',k,'<insert attribute value and uncomment>') )
+        print self.parent.amapListDraft[-1]
+    ##vaerr = not self.test( len(m)  == 0, 'Required variable attributes missing: %s' % str(m) )
 
     ##if vaerr or gaerr:
@@ -417 +427 @@
           raise
 
-    self.test( len(m)  == 0, 'Global attributes do not match constraints: %s' % str(m) )
+    if not self.test( len(m)  == 0, 'Global attributes do not match constraints: %s' % str(m) ):
+      for t in m:
+        self.parent.amapListDraft.append( '#@;%s=%s|%s=%s' % (t[0],str(t[1]),t[0],'<insert attribute value and uncomment>' + str(t[2]) ) )
 
     self.checkId = '007'