comparison V4/runme.py @ 22:a5b8e2b91d8f

fixing None Planets bug and reformatting output of fullResults

 
 def uniquify(itemList):
 	keyDict = {}
 	for item in itemList:
 		keyDict[item] = 1
-	return keyDict.keys()
+	return sorted(keyDict.keys())
 
 def outputPeople(filename,people):
 	with open(filename, "wb") as csv_file:
 		dictKeys = []
 		for person in people:
 			if person.issue is None:
-				person.horiscope.calcAllAspects()
-				dictKeys += person.horiscope.aspect.keys()
+				person.horiscope.makeAllAspectTreple()
+				dictKeys += person.horiscope.aspectTreple.keys()
 		dictKeys = uniquify(dictKeys)
-		writer = csv.DictWriter(csv_file, ['id']+dictKeys)
+		writer = csv.DictWriter(csv_file, ['id','score']+dictKeys)
 		writer.writeheader()
 		for person in people:
 			if person.issue is None:
-				tempDict = {'id':person.id}
-				tempDict.update(person.horiscope.aspect)
+				tempDict = {'id':person.id,'score':person.score}
+				tempDict.update(person.horiscope.aspectTreple)
 				# pdb.set_trace()
 				writer.writerow(tempDict)
 
 def outputScores(filename,people):
 	with open(filename, "wb") as csv_file:

 # def requestURL(url,payload):
 # 	r = requests.get(url, params=payload)
 # 	time.sleep(5)
 # 	return r
 
+def loadPickUpdate(filename):
+
 def loadPick(filename):
 	with open(filename, 'rb') as handle:
 		b = pickle.load(handle)
 	return b
 

 		issue = person.identifyIssues()
 		if issue is not None:
 			print 'SKIPPING person '+ person.id + ' error with ' + issue 
 		else:
 			print 'parsing person '+ person.id
-			person.makePayload()
-			person.requestURL()
+			if person.resp is None:
+				print 'Posting Request for person '+ person.id
+				person.makePayload()
+				person.requestURL()
+			print 'parsing person '+ person.id
 			person.horiscope = person.parsePage()
 			# person.horiscope.printPositions()
 		if saveFile is not None:
 				savePick(saveFile,people)