Changeset 981 for CMIP6dreq/trunk/dreqPy/dreq.py

Timestamp:

21/04/17 19:00:25 (4 years ago)

Author:

mjuckes

Message:

01.00.07

File:

• CMIP6dreq/trunk/dreqPy/dreq.py (modified) (5 diffs)

CMIP6dreq/trunk/dreqPy/dreq.py

@@ -131 +131 @@
   """Checks to be applied to strings"""
   def __init__(self):
-    self.__isInt = re.compile( '-{0,1}[0-9]+' )
+    self.__isInt = re.compile( '^-{0,1}[0-9]+$' )
 
   def isIntStr( self, tv ):
@@ -451 +451 @@
              if a in ['uid',]:
                thissect = '%s' % (self._h.title)
-               p = self.parent_map( el )
-               print ( 'ERROR.020.0001: missing uid: %s: a,tv,v: %s, %s, %s' % (thissect,a,tv,v) )
+               print ( 'ERROR.020.0001: missing uid: %s: a,tv,v: %s, %s, %s\n %s' % (thissect,a,tv,v,str( self.__dict__ )) )
                if etree:
+                 ##p = self.parent_map( el )
                  print ( ks )
                  raise
@@ -913 +913 @@
     self.version = self.c.version
     self.softwareVersion = version
+    self.indexSortBy = {}
     if not configOnly:
       self.inx = index(self.coll)
@@ -1084 +1085 @@
         ann = {}
 
-      ##self.coll[k].items.sort( ds('label').cmp )
+      sortkey = self.indexSortBy.get( k,'title')
+      print 'INFO.dreq.0001: %s, %s' % (k,sortkey)
+      ##self.coll[k].items.sort( ds(self.indexSortBy.get( k,'title') ).cmp )
+      items = sorted( self.coll[k].items, key=ds(sortkey).key )
       ttl = 'Data Request Section: %s' % k
       msg0.append( '<li><a href="index/%s.html">%s [%s]</a></li>\n' % (k,self.coll[k].header.title,k) )
@@ -1093 +1097 @@
       
       msg1 = []
-      for i in self.coll[k].items:
+      for i in items:
         ##m = '<li>%s: %s</li>' % ( i.label, i.__href__(odir='../u/') )
        
         m = lst( i, ann=ann.get( i.label ) )
         msg1.append( m )
-      msg += sorted( msg1 )
+      if k in self.indexSortBy:
+        msg += msg1
+      else:
+        msg += sorted( msg1 )
       msg.append( '</ul>' )
       bdy = '\n'.join( msg )