Fixed person title queries

mideind · Nov 20, 2019 · e081849 · e081849
1 parent 3b668bf
commit e081849
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/main.sh b/main.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+GREYNIR_DB_HOST=greynir.is GREYNIR_PORT=5000 python main.py
+
diff --git a/queries/builtin.py b/queries/builtin.py
@@ -807,19 +807,27 @@ def sentence(state, result):
 
 QPersonPrefix_nf →
     "hver" "er"
+    | "hver" "var"
     | "hvað" "gerir"
+    | "hvað" "gerði"
     | "hvað" "starfar"
+    | "hvað" "starfaði"
     | "hvaða" "titil" "hefur"
+    | "hvaða" "titil" "hafði"
     | "hvaða" "starfi" "gegnir"
+    | "hvaða" "starfi" "gegndi"
 
 QPersonPrefix_þf →
     "hvað" "veistu" "um"
     | "hvað" "geturðu" "sagt" "mér"? "um"
 
 QPersonPrefix_ef →
     "hver" "er" "titill"
+    | "hver" "var" "titill"
     | "hver" "er" "starfstitill"
+    | "hver" "var" "starfstitill"
     | "hvert" "er" "starf"
+    | "hvert" "var" "starf"
 
 QPersonPrefix_þgf →
     "segðu" "mér"? "frá"
@@ -881,6 +889,7 @@ def sentence(state, result):
     "hver" "er"
     | "hver" "var"
     | "hver" "hefur" "verið"
+    | "hvað" "heitir"
 
 QTitlePrefix_ef →
     QSegðuMér? "hver" "gegnir" "starfi"