3c7f8656752e3c4560fa51950504b57acc31932f
mmaddren
  Mon Oct 31 15:35:40 2011 -0700
trackInfo now supports the bam/bai comma separated filenames, style guide updated
diff --git python/programs/trackInfo/trackInfo python/programs/trackInfo/trackInfo
index e1b4038..de41e50 100755
--- python/programs/trackInfo/trackInfo
+++ python/programs/trackInfo/trackInfo
@@ -94,79 +94,82 @@
 	totalsize = 0
 	filecount = 0
 	
 	for idNum in ids:
 		
 		samplesize = 0
 		submittedfiles = 0
 		samplefiles = 0
 		expId = expIds[idNum]
 
 		for stanza in expId:
 			
 			if 'geoSampleAccession' in stanza and args.unsubmitted:
 				continue
 			
-			if stanza['fileName'] in compositeTrack.files and not args.missing:
-				file = compositeTrack.files[stanza['fileName']]
+            for fname in stanza['fileName'].split(','):
+                if fname in compositeTrack.files and not args.missing:
+                    file = compositeTrack.files[fname]
 				samplesize = samplesize + file.size
 				samplefiles = samplefiles + 1
 				totalsize = totalsize + file.size
 				filecount = filecount + 1
 				
 				if 'geoSampleAccession' in stanza:
 					submittedfiles = submittedfiles + 1
 				
 		size = ''
 		if args.size:
 			size = '[%s]' % filesize(samplesize)
 		
 		if idNum in geoMapping:
 			if geoMapping[idNum] == 'Inconsistent':
 				if not args.unsubmitted:
 					out.append('\t%s %s %s%s - %s files' % (str(idNum), styles.style(expId[0]['metaObject'], 'blue'), styles.style('[%s]' % geoMapping[idNum], 'yellow'), size, str(samplefiles)))
 			elif samplefiles == submittedfiles:
 				if not args.unsubmitted:
 					out.append('\t%s %s %s%s - %s files' % (str(idNum), styles.style(expId[0]['metaObject'], 'blue'), styles.style('[%s]' % geoMapping[idNum], 'green'), size, str(samplefiles)))
 			else:
 				out.append('\t%s %s %s%s - %s files' % (str(idNum), styles.style(expId[0]['metaObject'], 'cyan'), styles.style('[%s]' % geoMapping[idNum], 'green'), size, str(samplefiles)))
 		else:
 			out.append('\t%s %s %s - %s files' % (str(idNum), expId[0]['metaObject'], size, str(samplefiles)))
 
 		for stanza in expId:
 			
 			if 'geoSampleAccession' in stanza and args.unsubmitted or args.collapse:
 				continue
 
-			if stanza['fileName'] in compositeTrack.files:
+            for fname in stanza['fileName'].split(','):
+                    
+                if fname in compositeTrack.files:
 			
 				if args.missing:
 					continue
 			
-				file = compositeTrack.files[stanza['fileName']]
+                    file = compositeTrack.files[fname]
 				size = ''
 				if args.size:
 					size = '[%s]' % filesize(file.size)
 					
 				if 'geoSampleAccession' not in stanza:
 					out.append('\t\t%s %s' % (file.name, size))
 				elif idNum in geoMapping and geoMapping[idNum] == 'Inconsistent':
 					out.append('\t\t%s %s%s' % (styles.style(file.name, 'blue'), styles.style('[%s]' % stanza['geoSampleAccession'], 'green'), size))
 				else:
 					out.append('\t\t%s %s' % (styles.style(file.name, 'blue'), size))
 			else:
-				out.append('\t\t%s' % styles.style(stanza['fileName'], 'red'))
+                    out.append('\t\t%s' % styles.style(fname, 'red'))
 
 	strsub = ''
 	if 'geoSeriesAccession' in series:
 		strsub = styles.style('[%s]' % series['geoSeriesAccession'], 'green')
 	
 	modestr = ' '
 	for id in args.expIds:
 		modestr = modestr + id + ',' 
 	modestr = modestr[:len(modestr) - 1]
 	
 	size = ''
 	if args.size:
 		size = '[%s]' % filesize(totalsize)
 	
 	out.insert(0, '%s %s%s%s - %s files' % (compositeTrack.name, size, strsub, modestr, str(filecount)))