Changeset 458

Timestamp:

28/10/15 22:26:33 (5 years ago)

Author:

mjuckes

Message:

updated content

Location:

CMIP6dreqbuild/trunk/src/framework

Files:

• Makefile (modified) (1 diff)
• dreqPy/dreq.py (modified) (8 diffs)
• scanDreq.py (modified) (1 diff)
• vrev.py (added)

CMIP6dreqbuild/trunk/src/framework/Makefile

@@ -60 +60 @@
         echo "docs copied to /data/tmp/svn3/exarch/CMIP6dreq/trunk/docs"
         bash seddreq.sh annotated_20150731.xml dreq.xml dreqPy/dreq.py >  /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/dreq.py
-        bash seddreq02.sh "\.\.\/out" "\.\.\/docs" dreqPy/__init__.py > /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/__init__.py
+        bash seddreq02.sh "\.\.\/out" "\.\.\/docs" dreqPy/packageConfig.py > /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/packageConfig.py
         cp htmlTemplates.py dreqPy/scope.py dreqPy/example.py dreqPy/utilities.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy  
-        cp dreqPy/dreqCmdl.py dreqPy/packageConfig.py dreqPy/simpleCheck.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy
+        cp dreqPy/dreqCmdl.py dreqPy/__init__.py dreqPy/simpleCheck.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy
         cp vocabDemo.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy    
+        cp makeTables.py vrev.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/ 
         cp out/annotated_20150731.xml /data/tmp/svn3/exarch/CMIP6dreq/trunk/docs/dreq.xml
         ### cp LICENSE README.txt setup.py setup.cfg /data/tmp/svn3/exarch/CMIP6dreq/trunk/

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

@@ -31 +31 @@
        _urlBase = ''
        _htmlStyle = {}
+       _linkAttrStyle = {}
 
        def __init__(self,dict=None,xmlMiniDom=None,id='defaultId',etree=False):
@@ -69 +70 @@
            print ( 'Item <%s>: uninitialised' % self.sectionLabel )
 
-       def __href__(self,odir=""):
+       def __href__(self,odir="",label=None):
          igns =  {'','__unset__'}
          if 'description' in self.__dict__ and string.strip( self.description ) not in igns:
@@ -77 +78 @@
          else:
            ttl = self.label
-         return '<span title="%s"><a href="%s%s.html">%s</a></span>' % (ttl,odir,self.uid,self.uid)
+         if label == None:
+           label = self.uid
+         return '<span title="%s"><a href="%s%s.html">%s</a></span>' % (ttl,odir,self.uid,label)
+
+       def getHtmlLinkAttrStyle(self,a):
+         if a in self.__class__._linkAttrStyle:
+           return self.__class__._linkAttrStyle[a]
+         else:
+           return lambda a,targ: '<li>%s: [%s] %s [%s]</li>' % ( a, targ._h.label, targ.label, targ.__href__() )
 
        def __html__(self):
@@ -98 +107 @@
                      print ( a, self.__dict__[a], sect )
                      raise
-                   m = '<li>%s: [%s] %s [%s]</li>' % ( a, targ._h.label, targ.label, targ.__href__() )
+                   lst = self.getHtmlLinkAttrStyle(a)
+                   m = lst( a, targ )
+                   ##m = '<li>%s: [%s] %s [%s]</li>' % ( a, targ._h.label, targ.label, targ.__href__() )
                else:
                  m = '<li>%s: %s</li>' % ( a, self.__dict__[a] )
@@ -473 +484 @@
     self.coll = self.c.get()
     self.inx = index(self.coll)
+    self.defaultItemLineStyle = lambda i: '<li>%s: %s</li>' % ( i.label, i.__href__(odir='../u/') )
+    self.itemStyles = {}
 ##
 ## add index to Item base class .. so that it can be accessed by item instances
@@ -483 +496 @@
     dreqItemBase._htmlStyle['objective'] = {'getIrefs':['objectiveLink']}
     dreqItemBase._htmlStyle['requestLink'] = {'getIrefs':['objectiveLink','requestItem']}
-    dreqItemBase._htmlStyle['exptgroup'] = {'getIrefs':['experiment']}
+    dreqItemBase._htmlStyle['exptgroup'] = {'getIrefs':['__all__']}
+    dreqItemBase._htmlStyle['experiment'] = {'getIrefs':['__all__']}
+    dreqItemBase._htmlStyle['mip'] = {'getIrefs':['__all__']}
     dreqItemBase._htmlStyle['remarks'] = {'getIrefs':['__all__']}
 ##    dreqItemBase._htmlStyle['__general__'] = {'addRemarks':True}
@@ -492 +507 @@
 <div id="top">CMIP6 Data Request</div>
 %s</body></html>"""
+
+  def getHtmlItemStyle(self, sect):
+    if sect in self.itemStyles:
+      return self.itemStyles[sect]
+    return self.defaultItemLineStyle
 
   def makeHtml(self,odir='./html'):
@@ -514 +534 @@
       msg = ['<h1>%s</h1>\n' % ttl, '<ul>',]
       msg.append( '<a href="../index.html">Home</a><br/>\n' )
+      lst = self.getHtmlItemStyle(k)
       for i in self.coll[k].items:
-        m = '<li>%s: %s</li>' % ( i.label, i.__href__(odir='../u/') )
+        ##m = '<li>%s: %s</li>' % ( i.label, i.__href__(odir='../u/') )
+        m = lst( i )
         msg.append( m )
       msg.append( '</ul>' )

CMIP6dreqbuild/trunk/src/framework/scanDreq.py

@@ -519 +519 @@
         this.removeChild(d)
     for k in mrefs.keys():
-      print '>>>>>>>>>>> ',k
       if len(  mrefs[k] ) == 1:
         tid = mrefs[k][0][2]