cac75c44b2f270987145a238d65a54096b783f16
mmaddren
  Mon Jul 25 14:15:03 2011 -0700
bugfix to trackInfo now displays missing files correctly
diff --git python/programs/mkGeoPkg/trackInfo python/programs/mkGeoPkg/trackInfo
index 2946d18..803c123 100755
--- python/programs/mkGeoPkg/trackInfo
+++ python/programs/mkGeoPkg/trackInfo
@@ -145,31 +145,31 @@
 def createMappings(mdb):
 	expIds = dict()
 	geoMapping = dict()
 	expVars = None
 	series = None
 	datatype = None
 	
 	for stanza in mdb.itervalues():
 		
 		if 'objType' in stanza and stanza['objType'] == 'composite':
 			series = stanza
 			expVars = stanza['expVars'].split(',')
 			continue
 
 		if 'expId' not in stanza:
-			print stanza.name + ': no expId'
+			#print stanza.name + ': no expId'

 			continue
 		
 			# if this hasn't been submitted to GEO yet, we'll add it to the submission list
 		if stanza['expId'] not in expIds:
 			expIds[stanza['expId']] = list()
 			
 		expIds[stanza['expId']].append(stanza)
 		
 		if 'geoSampleAccession' in stanza:
 			# otherwise we keep track of the geo number for partially submitted samples
 			if stanza['expId'] not in geoMapping:
 				geoMapping[stanza['expId']] = stanza['geoSampleAccession']
 			elif geoMapping[stanza['expId']] != 'Inconsistent' and geoMapping[stanza['expId']] != stanza['geoSampleAccession']:
 				geoMapping[stanza['expId']] = 'Inconsistent'
 				print stanza.name + ': inconsistent geo mapping'
@@ -250,31 +250,31 @@
 		strsub = '[Unsubmitted]'
 		if idNum in geoMapping and geoMapping[idNum] == 'Inconsistent':
 			strsub = '[Inconsistent]'
 		if idNum in geoMapping and geoMapping[idNum] != 'Inconsistent':
 			strsub = '[' + geoMapping[idNum] + ']'		
 		
 		out.append('  + ' + expId[0]['metaObject'] + ' (' + str(idNum) + ')' + '[' + filesize(samplesize) + ']' + strsub + ' - ' + str(len(expId)) + ' files')
 		
 		for stanza in expId:
 			
 			if not os.path.exists(downloadsDirectory + stanza['fileName']):
 				out.append('  |     ' + stanza['fileName'] + ' MISSING FILE!')
 			else:
 			
 				st = os.stat(downloadsDirectory + stanza['fileName'])
-				out.append('  |     ' + stanza['fileName'] + ' [' + filesize(st.st_size) + ']')
+				#out.append('  |     ' + stanza['fileName'] + ' [' + filesize(st.st_size) + ']')

 
 	
 	strsub = '[Unsubmitted]'
 	if 'geoSeriesAccession' in series:
 		strsub = '[' + series['geoSeriesAccession'] + ']'
 	
 	modestr = ''
 	if mode == 1:
 		modestr = ' <' + minId + '>' 
 	elif mode == 2:
 		modestr = ' <' + minId + '-' + maxId + '>'
 		
 	out.insert(0, composite + ' [' + filesize(totalsize) + ']' + strsub + modestr + ' - ' + str(filecount) + ' files')
 
 	for line in out: