Changeset 591 for CMIP6dreqbuild/trunk/src/framework/scanDreq.py

Timestamp:

04/02/16 19:29:33 (5 years ago)

Author:

mjuckes

Message:

bug in scanDreq creating missing links .. fixed

File:

• CMIP6dreqbuild/trunk/src/framework/scanDreq.py (modified) (9 diffs)

CMIP6dreqbuild/trunk/src/framework/scanDreq.py

@@ -562 +562 @@
     self.doc = xml.dom.minidom.parse( src  )
     self.dreq = dreq
-    self.removedUids = set()
+    self.removedUids = {}
     this = self.doc.getElementsByTagName('var')[0]
     dil = this.getElementsByTagName('item')
@@ -576 +576 @@
     dil = this.getElementsByTagName('item')
     
+    
     filterStr = True
     for item in dil:
@@ -583 +584 @@
          print 'UNUSED STRUCTURE: %s, %s' % (lab,uid)
          this.removeChild( item )
+         self.removedUids[uid] = 'structure: %s' % lab
       else:
         tmid = item.getAttribute( 'tmid' )  
@@ -603 +605 @@
     for item in dil:
         uid = item.getAttribute( 'uid' )  
-        if 'requestLink' not in dq.inx.iref_by_sect[uid].a:
+        if ('requestLink' not in dq.inx.iref_by_sect[uid].a) and ('tableSection' not in dq.inx.iref_by_sect[uid].a):
+          self.removedUids[ uid ] = 'requestVarGroup:  %s' % item.getAttribute( 'label' )
           this.removeChild(item)
-          self.removedUids.add( uid )
           nn+=1
     print 'Unused variable groups removed: %s' % nn
@@ -618 +620 @@
         if vgid not in s1:
           this.removeChild(item)
-          self.removedUids.add( uid )
+          self.removedUids[ uid ] = 'requestVar:  %s' % item.getAttribute( 'label' )
           nn+=1
     print 'Unused request variables removed: %s' % nn
@@ -760 +762 @@
           new2.setAttribute( 'mip', 'OMIP' )
           new2.setAttribute( 'table', 'OMIP-Omon' )
+          ##if vid not in dq.inx.uid:
+            ##print 'ERROR.005.0001: vid %s not found' % vid
+          if omipOmonUid not in dq.inx.uid:
+            print 'ERROR.005.0001: vgid %s not found' % omipOmonUid
+          
           thisRqv.appendChild(new2)
 
 
-  def missingRefs(self,mrefs,clear=True):
+  def missingRefs(self,mrefs,dq,clear=True):
     this = self.doc.getElementsByTagName('remarks')[0]
     if clear:
@@ -785 +792 @@
         else:
           tattr = '__multiple__'
-      if k not in self.removedUids:
+      if tid == None or (tid not in self.removedUids):
         item = self.doc.createElement( 'item' )
         item.setAttribute( 'uid', k )  
@@ -793 +800 @@
         if tid != None:
           item.setAttribute( 'tid', tid )  
+          if tid not in dq.inx.uid:
+            print 'ERROR.005.0002: tid %s not found' % tid
         item.setAttribute( 'class', 'missingLink' )  
         item.setAttribute( 'description', 'Missing links detected and marked for fixing' )  
@@ -818 +827 @@
   an.rvgCheck(dq)
   an.strTtl(dq)
-  an.missingRefs( dq.inx.missingIds )
+  for k in an.removedUids:
+    print 'REMOVED: %s: %s' % (k,an.removedUids[k])
+  an.missingRefs( dq.inx.missingIds, dq )