WebSVN - navi - Path Comparison - / Rev 133 and / Rev 136

Ignore whitespace Rev 133 → Rev 136

/tsimapiak/parse.py
127,5 → 127,6
if word == None:
word = parseword(sent[-left:])
left -= len(word["word"]["navi"].split(" "))
word["word"]["translated"] = dbconnector.translate(word["word"]["id"],"eng")
ret.append(word)
return ret
return ret

 /tsimapiak/dbconnector.py
 ,4 → 32,14
         else:
             ret.append({"id": row["id"], "navi": row["navi"], "infix": row["navi"].lower(), "type": row["partOfSpeech"]})
     db.close()
-    return ret
+    return ret
+def translate(word,language):
+    db = tornado.database.Connection("127.0.0.1", "navi", user="navi", password="navi")
+    for row in db.query("""
+    SELECT *
+    FROM `localizedWords`
+    WHERE id = ? AND languageCode = ?""",word,language):
+        ret = row["localized"]
+    db.close()
+    return ret

 /tsimapiak/parsenum.py
 ,15 → 12,6
        u"pukap",
        u"kinä"]
-numord = [u"kewve",
-          u"'awve",
-          u"muve",
-          u"pxeyve",
-          u"tsìve",
-          u"mrrve",
-          u"puve",
-          u"kive"]
 rem = [u"aw",
        u"mun",
        u"pey",
 ,14 → 20,6
        u"fu",
        u"hin"]
-remord = [u"awve",
-       u"muve",
-       u"peyve",
-       u"sìve",
-       u"mrrve",
-       u"fuve",
-       u"hive"]
 base = [u"",
         u"me",
         u"pxe",
 ,12 → 30,12
 numre = \
-      u"^(a?)(?:(?:(" + "|".join(base) + u")zaza(?=m)(?:ve(?=$))?)?" + \
-      u"(?:(" + "|".join(base) + u")voza(?=m)(?:ve(?=$))?)?" + \
-      u"(?:(" + "|".join(base) + u")za(?=m)(?:ve(?=$))?)?" + \
-      u"(?:(" + "|".join(base) + u")(?:vol|vo(?=a|$))(?:ve(?=$))?)?" + \
-      u"(?:" + "|".join(remord + rem) + u"))|" + \
-      u"(?:" + "|".join(numord + num) + u")?(a?)$"
+      u"^(a?)(?:(" + "|".join(base) + u")zazam??)?" + \
+      u"(?:(" + "|".join(base) + u")vozam??)?" + \
+      u"(?:(" + "|".join(base) + u")zam??)?" + \
+      u"(?:(" + "|".join(base) + u")vo(?:l(?=a|))?)?" + \
+      u"((?:" + "|".join(rem) + u")|" + \
+      u"(?:" + "|".join(num) + u"))?((?:ve)?)(a?)$"
 numre = re.compile(numre)
 def parse(numin):