race submission code in place, failing, littered with debug statements

rowers/uploads.py

@@ -90,7 +90,18 @@ def matchuser(line):
         return words[1]
 
     return None
-        
+
+def matchrace(line):
+    testert = '^(race)'
+    tester = re.compile(testert)
+    if tester.match(line.lower()):
+        words = line.split()
+        try:
+            return int(words[1])
+        except:
+            return None
+
+    return None
         
 def matchsync(line):
     results = []
@@ -194,6 +205,14 @@ def getuseroptions_body2(uploadoptions,body):
 
     return uploadoptions
 
+def getraceoptions_body2(uploadoptions,body):
+    for line in body.splitlines():
+        raceid = matchrace(line)
+        if raceid:
+            uploadoptions['raceid'] = raceid
+
+    return uploadoptions
+
 def getsyncoptions_body2(uploadoptions,body):
     result = []
     for line in body.splitlines():
@@ -284,6 +303,15 @@ def getuser(uploadoptions,value,key):
 
     return uploadoptions
 
+def getrace(uploadoptions,value,key):
+    try:
+        raceid = int(value)
+        uploadoptions['raceid'] = raceid
+    except:
+        pass
+
+    return uploadoptions
+
 def getsource(uploadoptions,value,key):
     workoutsource = 'unknown'
     for type,verb in workoutsources:
@@ -330,7 +358,9 @@ def upload_options(body):
                 if 'source' in lowkey:
                     uploadoptions = getsource(uploadoptions,value,'workoutsource')
                 if 'username' in lowkey:
-                    uploadoptions = getuser(uploadoptions,value,'workoutuser')
+                    uploadoptions = getuser(uploadoptions,value,'username')
+                if 'raceid' in lowkey:
+                    uploadoptions = getraceid(uploadoptions,value,'raceid')
         except AttributeError:
             #pass
             raise yaml.YAMLError
@@ -343,6 +373,7 @@ def upload_options(body):
             uploadoptions = getstravaid(uploadoptions,body)
             uploadoptions = getworkoutsources(uploadoptions,body)
             uploadoptions = getuseroptions_body2(uploadoptions,body)
+            uploadoptions = getraceoptions_body2(uploadoptions,body)
         except IOError:
             pm = exc.problem_mark
             strpm = str(pm)