Changeset 71

Timestamp:

16/10/13 23:21:53 (7 years ago)

Author:

astephen

Message:

Added new branch.

Location:

CCCC/branches/branch-as

Files:

• . (copied) (copied from CCCC/trunk)
• BRANCH_NOTES.txt (added)
• analyse_logs.py (added)
• c4.py (modified) (6 diffs)
• fcc_utils.py (modified) (17 diffs)
• utils_c4.py (copied) (copied from CCCC/trunk/utils_c4.py) (3 diffs)

CCCC/branches/branch-as/c4.py

@@ -1 @@
-
+#!/usr/bin/env python
+
+"""
+c4.py
+=====
+
+Command-line entry point for the CCCC quality checking tool.
+
+This module contains as set of classes that manage the process and loggging.
+
+The code depends on PCMDI's CDMS2 library (part of CDAT or CDAT-Lite).
+
+"""
+
+# Standard library imports
+import os, string, time, sys
+import logging
+
+# Third-party imports
+import cdms2
+
+# Local imports
 import utils_c4 as utils
 import config_c4 as config
-import os, string, time
-import logging
 
 reload( utils )
-import cdms2
 
 vocabs = { 'variable':utils.mipVocab(), \
@@ -22 +40 @@
 #rcm_version_id = <RCMVersionID>                     
 
-class dummy:
+class Dummy(object):
+   "A simple container class."
    pass
 
-class recorder:
+class Recorder(object):
+  "A class for recording the results of file checks."
 
   def __init__(self,fileName,type='map'):
@@ -87 +107 @@
     self.records[fn] = record
 
-class checker:
+class FileChecker(object):
+  "Class for checking data files."
+
   def __init__(self):
-    self.info = dummy()
+    self.info = Dummy()
     self.calendar = 'None'
     self.cfn = utils.checkFileName(parent=self.info)
@@ -159 +181 @@
     self.errorCount = self.cfn.errorCount + self.cga.errorCount + self.cgd.errorCount + self.cgg.errorCount
 
-class c4_init:
+class C4Init(object):
 
   def __init__(self):
@@ -235 +257 @@
     self.fHdlr.close()
 
-cc = checker()
+cc = FileChecker()
 
 cal = None
 
 if __name__ == '__main__':
-  import sys
-  c4i = c4_init()
-  rec = recorder( c4i.recordFile )
+
+  c4i = C4Init()
+  rec = Recorder( c4i.recordFile )
 
   c4i.logger.info( 'Starting batch -- number of file: %s' % (len(c4i.flist)) )
@@ -285 +307 @@
 
   cc.info.log = c4i.logger
-  cbv.check( recorder=rec, calendar=cc.calendar)
+  cbv.check(recorder=rec, calendar=cc.calendar)
   rec.dumpAll()
   c4i.hdlr.close()

CCCC/branches/branch-as/fcc_utils.py

@@ -5 +5 @@
 ##
 
-class mipTableScan:
+class MipTableScan(object):
 
   def __init__(self, vats = ['standard_name','long_name','units','cell_methods'] ):
@@ -106 +106 @@
 ## this class carries a logging method, and is used to carry information about datasets being parsed.
 ##
-class qcHandler:
+class OLD_NOT_USED_qcHandler(object):
+
 
   def __init__( self, qcc, log, baseDir, logPasses=True ):
@@ -179 +180 @@
     self.msgk[key] += 1
 
-class dirParser:
+class OLD_NOT_USED_dirParser:
 
   def __init__(self, qcc, linksOnly=True):
@@ -353 +354 @@
           handler.datasets[k][dsId].append( (dir,f, handler.nofail, ns) )
 
-class dataSetParser:
+class OLD_NOT_USED_dataSetParser:
 
   def __init__(self,qcc, log, handler):
@@ -521 +522 @@
        
 
-class dataset:
+class Dataset(object):
+   "A container class for a dataset."
+
    def __init__(self,name):
      self.name = name
 
-class qcConfigParse:
+class OLD_NOT_USED_qcConfigParse(object):
+  "A class to parse configuration files for the QC process."
 
   def __init__( self, file, log=None ):
@@ -560 +564 @@
       elif l[0:6] == 'START ':
         sname = string.strip( string.split(l)[1] )
-        self._parse_l0_section = section_parser_l0( self, sname )
+        self._parse_l0_section = SectionParserL0( self, sname )
         f = True
 
@@ -573 +577 @@
      for s in requiredSections:
        assert s in self.sections.keys(), 'Required section %s not found in %s [parsing %s]' % (s, self.section.keys(),self.file)
-     self._parse_l1 = section_parser_l1( self )
+     self._parse_l1 = SectionParserL1( self )
      self._parse_l1.parse( 'GENERAL' )
      self._parse_l1.parse( 'VOCABULARIES' )
@@ -594 +598 @@
 revsc = re.compile( 'validSectionCount,(.+)' )
 
-class section_parser_l1:
+class SectionParserL1(object):
 
   def __init__(self,parent):
@@ -727 +731 @@
           self.parent.vocab[id] = vlist[:]
           if id == 'mipVarAtts':
-            self.mipsc = mipTableScan( vlist )
+            self.mipsc = MipTableScan( vlist )
   
   def parse_filename(self):
     sep = self.__get_match( refs, self.currentSection[1], 'File separator' )
     nn = map( int, string.split( self.__get_match( revsc, self.currentSection[2], 'File separator' ),',') )
-    self.parent.fileNameSegments = fileNameSegments( self.parent, sep, nn )
+    self.parent.fileNameSegments = FileNameSegments( self.parent, sep, nn )
     for l in self.currentSection[3:]:
        self.parent.fileNameSegments.add(l)
@@ -864 +868 @@
            self.datasetVersionMode.append( None )
        elif bits[0] == 'datasetId':
-         thisDs = dataset(bits[1])
+         thisDs = Dataset(bits[1])
          thisDs.datasetIdMethod = bits[2]
          if bits[2] == 'prints':
@@ -871 +875 @@
          elif bits[2] == 'joinFileNameSegSlice':
            thisSlice = slice( int(bits[4]), int(bits[5]) )
-           thisDs.getDatasetId = dsid1( thisSlice, bits[3] ).get
+           thisDs.getDatasetId = DSID1( thisSlice, bits[3] ).get
            thisDs.datasetIdArg = 'fileNameBits'
          elif bits[2] == 'cmip5':
            thisSlice = slice( int(bits[4]), int(bits[5]) )
-           thisDs.getDatasetId = cmip5_dsid( thisSlice, bits[3] ).get
+           thisDs.getDatasetId = CMIP5DSID( thisSlice, bits[3] ).get
            thisDs.datasetIdArg = 'filePathBits'
          self.parent.datasets[bits[1]] = thisDs
@@ -907 +911 @@
           self.parent.datasets[bb[k]].child = self.parent.datasets[bb[k+1]]
           
-class dsid1:
+class DSID1(object):
 
   def __init__(self,slice,sep):
@@ -916 +920 @@
     return string.join( x[self.slice], self.sep ) 
 
-class cmip5_dsid:
+class CMIP5DSID(object):
 
   def __init__(self,slice,sep):
@@ -926 +930 @@
 
 
-class get_trange:
+class GetTRange(object):
  
   def __init__(self,pat,kseg):
@@ -974 +978 @@
     return self._get( l[self.kseg] )
          
-class fileNameSegments:
+class FileNameSegments(object):
+
   def __init__(self, parent, sep, nn ):
     self.sep = sep
@@ -1001 +1006 @@
     if bits[2] == 'TimeRange':
        self.parent.hasTimeRange = True
-       self.parent.timeRange = get_trange(regex,k)
+       self.parent.timeRange = GetTRange(regex,k)
 
   def finish(self):
@@ -1244 +1249 @@
            return ('VALUE',bits[1])
 
-class section_parser_l0:
+class SectionParserL0(object):
 
   def __init__(self,parent,sectionName):

CCCC/branches/branch-as/utils_c4.py

@@ -2 +2 @@
 import string, re, os, sys
 
-from fcc_utils import mipTableScan
-
-class reportSection:
+from fcc_utils import MipTableScan
+
+class ReportSection:
 
   def __init__(self,id,cls,parent=None, description=None):
@@ -20 +20 @@
   def addSubSection( self, id, cls, description=None):
     assert not self.closed, 'Attempt to add sub-section to closed report section'
-    self.subsections.append( reportSection(id, cls, parent=self, description=description )  )
+    self.subsections.append( ReportSection(id, cls, parent=self, description=description )  )
     self.auditDone = False
     return self.subsections[-1]
@@ -564 +564 @@
 
   def __init__(self):
-     ms = mipTableScan()
+     ms = MipTableScan()
      dir = 'cordex_vocabs/mip/'
      self.varInfo = {}