Changeset 331


Ignore:
Timestamp:
20/05/15 12:08:17 (5 years ago)
Author:
mjuckes
Message:

cleared up misleading message for variable with no standard name in table; milli-second naming mode for log files

Location:
CCCC/trunk/ceda_cc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/ccinit.py

    r327 r331  
    1212  :--log: <single|multi>:  Set log file management option -- see "Single log" and "Multi-log" below. 
    1313  :--blfmode: <mode>:    Set mode for batch log file -- see log file modes 
     14  :--blfms:            Set milli-second mode for naming batch log files (instead of second mode); 
    1415  :--flfmode: <mode>:  Set mode for file-level log file -- see log file modes 
    1516  :--aMap:             Read in some attribute mappings and run tests with virtual substitutions; 
     
    3839    self.policyFileLogfileMode = 'w' 
    3940    self.policyBatchLogfileMode = 'np' 
     41    self.policyBatchLogfileMs = False 
    4042    if args==None: 
    4143       args = sys.argv[1:] 
     
    108110        assert lfmk in ['a','n','np','w','wo'], 'Unrecognised batch logfile mode (--blfmode): %s' % lfmk 
    109111        self.policyBatchLogfileMode = lfmk 
     112      elif next == '--blfms': 
     113        self.policyBatchLogfileMs = False 
    110114      elif next == '-d': 
    111115        fdir = args.pop(0) 
     
    187191 
    188192    tstring1 = '%4.4i%2.2i%2.2i_%2.2i%2.2i%2.2i' % time.gmtime()[0:6] 
     193    if self.policyBatchLogfileMs: 
     194      t = time.time() 
     195      ms = int( ( t-int(t) )*1000. ) 
     196      tsring1 += '.%3.3i' % ms 
    189197    self.batchLogfile = '%s/qcBatchLog_%s.txt' % (  self.logDir,tstring1) 
    190198## default appending to myapp.log; mode='w' forces a new file (deleting old contents). 
  • CCCC/trunk/ceda_cc/utils_c4.py

    r329 r331  
    621621        self.parent.amapListDraft = [] 
    622622      for m in mm: 
    623           self.parent.amapListDraft.append( '@var=%s;%s=%s|%s=%s' % (varName,m[0],m[1],m[0],m[2]) ) 
     623          if m[2] == None: 
     624            self.parent.amapListDraft.append( '## @var=%s;%s=%s|@delete=%s -- not supported yet' % (varName,m[0],m[1],m[0]) ) 
     625          else: 
     626            self.parent.amapListDraft.append( '@var=%s;%s=%s|%s=%s' % (varName,m[0],m[1],m[0],m[2]) ) 
    624627 
    625628    if ok: 
Note: See TracChangeset for help on using the changeset viewer.