Changeset 712

Timestamp:

09/08/16 17:00:21 (3 years ago)

Author:

mjuckes

Message:

charme enabled

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• dreq.py (modified) (5 diffs)
• makeTables.py (modified) (2 diffs)
• misc_utils.py (modified) (1 diff)
• scope.py (modified) (1 diff)

CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py

@@ -20 +20 @@
   pythonPre27 = sys.version_info[1] < 7
 
+charmeTempl = """<span title="Using the CHARMe annotation system">Comment on this page:<a href="%s/%s/%s.html" class="charme-metadata-document"></a></span>
+
+<span>
+<div id="charme-placeholder"></div>
+</span>
+<br/>
+<!-- the charme-placeholder-all-targets appears to be required, but can be hidden ... -->
+<span style="display: None;">
+<div id="charme-placeholder-all-targets"></div>
+</span>
+"""
+
 jsh='''<link type="text/css" href="/css/jquery-ui-1.8.16.custom.css" rel="Stylesheet" />
  <script src="/js/2013/jquery.min.js" type="text/javascript"></script>
@@ -27 +39 @@
 <link type="text/css" href="/css/dreq.css" rel="Stylesheet" />
 '''
+
+def dref(i,x):
+  return i._inx.uid[i.__dict__[x]]
 
 blockSchemaFile = '%s/%s' % (DOC_DIR, 'BlockSchema.csv' )
@@ -135 +150 @@
        _htmlStyle = {}
        _linkAttrStyle = {}
+       __charmeEnable__ = {}
 
        def __init__(self,idict=None,xmlMiniDom=None,id='defaultId',etree=False):
@@ -232 +248 @@
            sect = self._h.label
            msg.append( '<h1>%s: [%s] %s</h1>' % (self._h.title,self.label,self.title) )
+           if sect in self.__charmeEnable__:
+             msg.append( charmeTempl % (self.__charmeEnable__[sect].site, 'u', self.uid) )
            msg.append( '<a href="../index.html">Home</a> &rarr; <a href="../index/%s.html">%s section index</a><br/>\n' % (sect, self._h.title) )
            msg.append( '<ul>' )
@@ -303 +321 @@
            elif self._base._indexInitialised:
              msg += self.__irefHtml__(sect,ghis)
+           if sect in self.__charmeEnable__:
+             msg.append( '<script src="/js/dreq/charme/charme.js"></script>' )
          else:
            msg.append( '<b>Item %s: uninitialised</b>' % self.sectionLabel )

CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py

@@ -1 +1 @@
 
 import collections, string, os, sys
+
+nt__charmeEnable = collections.namedtuple( 'charme', ['id','site'] )
 
 try:
@@ -770 +772 @@
   dq.itemStyles['requestVar'] = styls.rqvLink01
 
+  dreq.dreqItemBase.__charmeEnable__['var'] = nt__charmeEnable( 'test','http://clipc-services.ceda.ac.uk/dreq' )
+
   ht = htmlTrees(dq)
   dq.makeHtml( annotations={'var':ht.anno}, ttl0='Data Request [%s]' % dreq.version )

CMIP6dreqbuild/trunk/src/framework/dreqPy/misc_utils.py

@@ -1 @@
-import collections, string
+import collections, string , os
+import logging
+import time
+
+class dreqLog(object):
+  def __init__(self, dir='.'):
+    self.tstring2 = '%4.4i%2.2i%2.2i' % time.gmtime()[0:3]
+    self.logdir = dir
+    if not os.path.isdir( dir ):
+      os.mkdir(dir )
+      print ( 'dreqLog: making a new directory fr log files: %s' % dir )
+
+  def getLog(self,name,dir=None):
+    if dir == None:
+      dir = self.logdir
+    testLogFile = '%s/dreq_%s_%s.txt' % (dir,name,self.tstring2)
+    log = logging.getLogger(testLogFile)
+    fHdlr = logging.FileHandler(testLogFile,mode='w')
+    fileFormatter = logging.Formatter('%(message)s')
+    fHdlr.setFormatter(fileFormatter)
+    log.addHandler(fHdlr)
+    log.setLevel(logging.INFO)
+    return log
 
 def rankCMORvars(dq):

CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

@@ -185 +185 @@
       if i.odims != '':
         s = s*5
-      self.sz[i.uid] = self.szss[i.spid]*s
-      for k in szr:
-        self.szg[k][i.uid] = self.szgss[k][i.spid]*s
+      if i.spid in self.szss:
+        self.sz[i.uid] = self.szss[i.spid]*s
+        for k in szr:
+          self.szg[k][i.uid] = self.szgss[k][i.spid]*s
+      else:
+        print ('WARNING: spid has no size info: %s' % i.spid )
+        self.sz[i.uid] = 0.
+        for k in szr:
+          self.szg[k][i.uid] = 0.
 
   def getRequestLinkByMip( self, mipSel ):