comparison V4/dParse.py @ 19:ae220e89cb3a

fixing parse bugs, and angle calculation bugs

 from geopy.geocoders import Nominatim
 from geopy.exc import GeocoderTimedOut
 import random
 import pdb
 
-DEFAULT_TIME_H = None
-DEFAULT_TIME_M = None
+DEFAULT_TIME = None
+# DEFAULT_TIME_M = None
 DEAULT_LOCATION = None
 
 def regulateData(dataDict):
 	print("Parse %s"%(str(dataDict['ID'])))
 	p_DOBQ = "What is your partner's date of birth? Please use the format DD/MM/YYYY (for example, 29/03/1981)."

 		print 'error with day month'
 		print (r,d,m)
 	return (d,m,y)
 
 def parseTOB(T):
-	# pdb.set_trace()
 	timeFlag = None
 	T_ = T.replace('.','').lower().strip()
 	if 'am' in T_:
 		timeFlag = 0
 		T = T_.replace('am','')

 				H = int(T)
 				M = 0
 			elif int(T) > 100:
 				H = int(T)/100
 				M = int(T)%100
+			else:
+				return None
 		if timeFlag is not None:
 			if timeFlag == 0:
 				H = H%12
 			else:
 				H = H%12 + 12
 	except ValueError:
-		H = DEFAULT_TIME_H
-		M = DEFAULT_TIME_M
+		return None
 	return (H,M)
-
-
+	
+
+