comparison seg2matrix/CGData/BaseTable.py @ 50:b6f5d2d1b047

fix
author jingchunzhu
date Tue, 25 Aug 2015 23:42:17 -0700
parents ab20c0d04f4a
children 3a036a34c362
comparison
equal deleted inserted replaced
49:986bca7bc318 50:b6f5d2d1b047
62 comment = self['cgformat']['comment'] 62 comment = self['cgformat']['comment']
63 linenum = 0 63 linenum = 0
64 for row in read: 64 for row in read:
65 linenum += 1 65 linenum += 1
66 r = self.__row_class__() 66 r = self.__row_class__()
67 if comment is None or not row[0].startswith(comment): 67 if (comment is None or not row[0].startswith(comment)) and not row[0].startswith("#"):
68 for i, col in enumerate(cols): 68 for i, col in enumerate(cols):
69 isOptional = False 69 isOptional = False
70 if 'columnDef' in self['cgformat'] and col in self['cgformat']['columnDef'] and 'optional' in self['cgformat']['columnDef'][col]: 70 if 'columnDef' in self['cgformat'] and col in self['cgformat']['columnDef'] and 'optional' in self['cgformat']['columnDef'][col]:
71 isOptional = self['cgformat']['columnDef'][col]['optional'] 71 isOptional = self['cgformat']['columnDef'][col]['optional']
72 if len(row) > i: 72 if len(row) > i: