Changeset 935
- Timestamp:
- 20/01/17 20:24:16 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py
r895 r935 210 210 else: 211 211 ttl = self.label 212 ttl = string.replace( ttl,'"', '"' )213 ttl = string.replace( ttl,'<', '<' )214 self._htmlTtl = string.replace( ttl,'>', '>' )212 ttl = ttl.replace( '"', '"' ) 213 ttl = ttl.replace( '<', '<' ) 214 self._htmlTtl = ttl.replace( '>', '>' ) 215 215 title=self._htmlTtl 216 216 if label == None: … … 222 222 223 223 def htmlLinkAttrListStyle(self,a,targ,frm=None): 224 xx = string.join( ['%s [%s]' % (x.label, x.__href__()) for x in targ], '; ')224 xx = '; '.join( ['%s [%s]' % (x.label, x.__href__()) for x in targ]) 225 225 return '<li>%s: [%s] %s</li>' % ( a, targ[0]._h.label, xx ) 226 226 … … 318 318 am.append( '<ul>' ) 319 319 items = [self._inx.uid[u] for u in self._inx.iref_by_sect[self.uid].a[t] ] 320 items.sort( ds('label').cmp ) 320 ##items.sort( ds('label').cmp ) 321 items = sorted( items, key=ds('label').key ) 321 322 for targ in items: 322 323 if ghis == None: … … 865 866 def cmp(self,x,y): 866 867 return cmp( x.__dict__[self.k], y.__dict__[self.k] ) 868 def key(self,x): 869 return x.__dict__[self.k] 867 870 868 871 class kscl(object): … … 873 876 def cmp(self,x,y): 874 877 return cmp( self.idict[x].__dict__[self.k], self.idict[y].__dict__[self.k] ) 878 def key(self,x): 879 return self.idict[x].__dict__[self.k] 875 880 876 881 src1 = '../workbook/trial_20150831.xml' … … 1010 1015 return str(v) 1011 1016 elif typ == "aa:st__stringList": 1012 return string.join(v)1017 return ' '.join(v) 1013 1018 elif typ in ["aa:st__integerList","aa:st__integerListMonInc", "aa:st__floatList"]: 1014 return string.join( [str(x) for x in v] )1019 return ' '.join( [str(x) for x in v] ) 1015 1020 else: 1016 1021 assert False, 'Data type not recognised' … … 1023 1028 1024 1029 if self.c.rc.isIntStr(a): 1025 a = int(a)1030 a = '%3.3i' % int(a) 1026 1031 if self.c.rc.isIntStr(b): 1027 b = int(b)1032 b = '%3.3i' % int(b) 1028 1033 rv = (a,b) 1029 1034 elif len(ab) == 1: … … 1041 1046 1042 1047 ks = self.inx.uid.keys() 1043 ks.sort( kscl( self.inx.uid, 'title' ).cmp ) 1048 ##ks.sort( kscl( self.inx.uid, 'title' ).cmp ) 1049 ks = sorted( ks, key=kscl( self.inx.uid, 'title' ).key ) 1044 1050 for k in ks: 1045 1051 i = self.inx.uid[k] 1046 1052 ttl = 'Data Request Record: [%s]%s' % (i._h.label,i.label) 1047 bdy = string.join( i.__html__( ghis=self.getHtmlItemStyle ), '\n')1053 bdy = '\n'.join( i.__html__( ghis=self.getHtmlItemStyle ) ) 1048 1054 oo = open( '%s/u/%s.html' % (odir,i.uid), 'w' ) 1049 1055 oo.write( self.pageTmpl % (ttl, jsh, '../', '../index.html', bdy ) ) … … 1073 1079 ann = {} 1074 1080 1075 self.coll[k].items.sort( ds('label').cmp )1081 ##self.coll[k].items.sort( ds('label').cmp ) 1076 1082 ttl = 'Data Request Section: %s' % k 1077 1083 msg0.append( '<li><a href="index/%s.html">%s [%s]</a></li>\n' % (k,self.coll[k].header.title,k) ) … … 1081 1087 lst = self.getHtmlItemStyle(k) 1082 1088 1089 msg1 = [] 1083 1090 for i in self.coll[k].items: 1084 1091 ##m = '<li>%s: %s</li>' % ( i.label, i.__href__(odir='../u/') ) 1085 1092 1086 1093 m = lst( i, ann=ann.get( i.label ) ) 1087 msg.append( m ) 1094 msg1.append( m ) 1095 msg += sorted( msg1 ) 1088 1096 msg.append( '</ul>' ) 1089 bdy = string.join( msg, '\n')1097 bdy = '\n'.join( msg ) 1090 1098 oo = open( '%s/index/%s.html' % (odir,k), 'w' ) 1091 1099 oo.write( self.pageTmpl % (ttl, '', '../', '../index.html', bdy ) ) 1092 1100 oo.close() 1093 1101 msg0.append( '</ul>' ) 1094 bdy = string.join( msg0, '\n')1102 bdy = '\n'.join( msg0 ) 1095 1103 oo = open( '%s/index.html' % odir, 'w' ) 1096 1104 oo.write( self.pageTmpl % (ttl0, '', '', 'index.html', bdy ) )
Note: See TracChangeset
for help on using the changeset viewer.