diff V4/dParse.py @ 15:50a95089414d

updating to allow for all aspects to be calculated, and remove default value passing for people.

--- a/V4/dParse.py	Sun Mar 04 15:03:15 2018 +0000
+++ b/V4/dParse.py	Sun Mar 04 17:09:50 2018 +0000
@@ -8,19 +8,9 @@
 import random
 import pdb
 
-DEFAULT_TIME_H = 12
-DEFAULT_TIME_M = 00
-DEAULT_LOCATION = 'USA'
-
-# def parseCSV(filename):
-# 	stream = csv.DictReader(open(filename,'rb'))
-# 	dictList = []
-# 	people = []
-# 	for line in stream:
-# 		people.append(syn.person(line))
-# 	return people
-# 		# dictList.append(regulateData(line))
-# 	# return dictList
+DEFAULT_TIME_H = None
+DEFAULT_TIME_M = None
+DEAULT_LOCATION = None
 
 def regulateData(dataDict):
 	print("Parse %s"%(str(dataDict['ID'])))
@@ -238,76 +228,4 @@
 		M = DEFAULT_TIME_M
 	return (H,M)
 
-def makePayload(dataDict):
-	if type(dataDict['COB']) is str:
-		cob_0 = float(dataDict['COB'].split(',')[0][1:])
-		cob_1 = float(dataDict['COB'].split(',')[1])
-		dataDict['COB'] = (cob_0,cob_1)
-	if type(dataDict['pCOB']) is str:
-		pcob_0 = float(dataDict['pCOB'].split(',')[0][1:])
-		pcob_1 = float(dataDict['pCOB'].split(',')[1])
-		dataDict['pCOB'] = (pcob_0,pcob_1)
-	if type(dataDict['DOB']) is str:
-		dataDict['DOB'] = dataDict['DOB'][1:-1].split(',')
-	if type(dataDict['pDOB']) is str:
-		dataDict['pDOB'] = dataDict['pDOB'][1:-1].split(',')
-	if type(dataDict['TOB']) is str:
-		dataDict['TOB'] = dataDict['TOB'][1:-1].split(',')
-	if type(dataDict['pTOB']) is str:
-		dataDict['pTOB'] = dataDict['pTOB'][1:-1].split(',')
-	# pdb.set_trace()
 
-	print dataDict['pDOB']
-
-	R = {'send_calculation':'1', #Req
-		'muz_narozeni_den':dataDict['DOB'][0],
-		'muz_narozeni_mesic':dataDict['DOB'][1],
-		'muz_narozeni_rok':dataDict['DOB'][2],
-		'muz_narozeni_hodina':dataDict['TOB'][0],
-		'muz_narozeni_minuta':dataDict['TOB'][1],
-		'muz_narozeni_city':'',
-		'muz_narozeni_mesto_hidden':'Manually+place%3A+%C2%B0%27N%2C+%C2%B0%27E',#auto
-		'muz_narozeni_stat_hidden':'XX',
-		'muz_narozeni_podstat_kratky_hidden':'',
-		'muz_narozeni_podstat_hidden':'',
-		'muz_narozeni_podstat2_kratky_hidden':'',
-		'muz_narozeni_podstat3_kratky_hidden':'',
-		'muz_narozeni_input_hidden':'',
-		'muz_narozeni_sirka_stupne':str(abs(dataDict['COB'][0])).split('.')[0],
-		'muz_narozeni_sirka_minuty':str(float('0.'+str(dataDict['COB'][0]).split('.')[1])*60).split('.')[0],
-		'muz_narozeni_sirka_smer': '1' if dataDict['COB'][0]<0 else '0', #address N Dir (0':'N',1':'S)
-		'muz_narozeni_delka_stupne':str(abs(dataDict['COB'][1])).split('.')[0], #address E - Main
-		'muz_narozeni_delka_minuty':str(float('0.'+str(dataDict['COB'][1]).split('.')[1])*60).split('.')[0],
-		'muz_narozeni_delka_smer': '1' if dataDict['COB'][1]<0 else '0', #address E Dir (0':'E',1':'W)
-		'muz_narozeni_timezone_form':'auto',
-		'muz_narozeni_timezone_dst_form':'auto',
-		'send_calculation':'1',
-		'zena_narozeni_den':dataDict['pDOB'][0],
-		'zena_narozeni_mesic':dataDict['pDOB'][1],
-		'zena_narozeni_rok':dataDict['pDOB'][2],
-		'zena_narozeni_hodina':dataDict['pTOB'][0],
-		'zena_narozeni_minuta':dataDict['pTOB'][1],
-		'zena_narozeni_city':'',
-		'zena_narozeni_mesto_hidden':'Manually+place%3A+%C2%B0%27N%2C+%C2%B0%27E',
-		'zena_narozeni_stat_hidden':'XX',
-		'zena_narozeni_podstat_kratky_hidden':'',
-		'zena_narozeni_podstat_hidden':'',
-		'zena_narozeni_podstat2_kratky_hidden':'',
-		'zena_narozeni_podstat3_kratky_hidden':'',
-		'zena_narozeni_input_hidden':'',
-		'zena_narozeni_sirka_stupne':str(abs(dataDict['pCOB'][0])).split('.')[0],
-		'zena_narozeni_sirka_minuty':str(float('0.'+str(dataDict['pCOB'][0]).split('.')[1])*60).split('.')[0],
-		'zena_narozeni_sirka_smer': '1' if dataDict['pCOB'][0]<0 else '0',
-		'zena_narozeni_delka_stupne':str(abs(dataDict['pCOB'][1])).split('.')[0],
-		'zena_narozeni_delka_minuty':str(float('0.'+str(dataDict['pCOB'][1]).split('.')[1])*60).split('.')[0],
-		'zena_narozeni_delka_smer': '1' if dataDict['pCOB'][1]<0 else '0',
-		'zena_narozeni_timezone_form':'auto',
-		'zena_narozeni_timezone_dst_form':'auto',
-		'switch_interpretations':'0',
-		'house_system':'placidus',
-		'uhel_orbis':'#tabs_redraw'}
-	return R
-
-
-
-