Update app.py

app.py

@@ -180,63 +180,68 @@ def is_numword(x):
         return True
     return False
 
-def from_numword(x):
-    if is_number(x):
-        scale = 0
-        increment = int(x.replace(',', ''))
-        return scale, increment
-    return numwords[x]
-
-for word in textnum.split():
-    if word in ordinal_words:
-        scale, increment = (1, ordinal_words[word])
-        current = current * scale + increment
-        if scale > 100:
-            result += current
-            current = 0
-        onnumber = True
-        lastunit = False
-        lastscale = False
-    else:
-        for ending, replacement in ordinal_endings:
-            if word.endswith(ending):
-                word = "%s%s" % (word[:-len(ending)], replacement)
-
-        if (not is_numword(word)) or (word == 'and' and not lastscale):
-            if onnumber:
-                curstring += repr(result + current) + " "
-            curstring += word + " "
-            result = current = 0
-            onnumber = False
-            lastunit = False
-            lastscale = False
-        else:
-            scale, increment = from_numword(word)
-            onnumber = True
 
-            if lastunit and (word not in scales):
-                curstring += repr(result + current)
-                result = current = 0
-
-            if scale > 1:
-                current = max(1, current)
+    def from_numword(x):
+        if is_number(x):
+            scale = 0
+            increment = int(x.replace(',', ''))
+            return scale, increment
+        return numwords[x]
 
+    for word in textnum.split():
+        if word in ordinal_words:
+            scale, increment = (1, ordinal_words[word])
             current = current * scale + increment
             if scale > 100:
                 result += current
                 current = 0
-
-            lastscale = False
+            onnumber = True
             lastunit = False
-            if word in scales:
-                lastscale = True
-            elif word in units:
-                lastunit = True
+            lastscale = False
+        else:
+            for ending, replacement in ordinal_endings:
+                if word.endswith(ending):
+                    word = "%s%s" % (word[:-len(ending)], replacement)
+
+            if (not is_numword(word)) or (word == 'and' and not lastscale):
+                if onnumber:
+                    # Flush the current number we are building
+                    curstring += repr(result + current) + " "
+                curstring += word + " "
+                result = current = 0
+                onnumber = False
+                lastunit = False
+                lastscale = False
+            else:
+                scale, increment = from_numword(word)
+                onnumber = True
+
+                if lastunit and (word not in scales):                                                                                                                                                                                                                                         
+                    # Assume this is part of a string of individual numbers to                                                                                                                                                                                                                
+                    # be flushed, such as a zipcode "one two three four five"                                                                                                                                                                                                                 
+                    curstring += repr(result + current)                                                                                                                                                                                                                                       
+                    result = current = 0                                                                                                                                                                                                                                                      
+
+                if scale > 1:                                                                                                                                                                                                                                                                 
+                    current = max(1, current)                                                                                                                                                                                                                                                 
+
+                current = current * scale + increment                                                                                                                                                                                                                                         
+                if scale > 100:                                                                                                                                                                                                                                                               
+                    result += current                                                                                                                                                                                                                                                         
+                    current = 0                                                                                                                                                                                                                                                               
+
+                lastscale = False                                                                                                                                                                                                              
+                lastunit = False                                                                                                                                                
+                if word in scales:                                                                                                                                                                                                             
+                    lastscale = True                                                                                                                                                                                                         
+                elif word in units:                                                                                                                                                                                                             
+                    lastunit = True
+
+    if onnumber:
+        curstring += repr(result + current)
+
+    return curstring
 
-if onnumber:
-    curstring += repr(result + current)
-    
-return curstring
 
 # Convert sentence to transcript using Soundex
 def sentence_to_transcript(sentence, word_to_code_map):