Added common-nouns list, minor bugfixes

1 files changed, 5 insertions, 1 deletions

diff --git a/solver.py b/solver.py
index 4c302b5..7935204 100644
--- a/solver.py
+++ b/solver.py
@@ -48,14 +48,18 @@ def solve(query):
 
     # full solution
     decArt = tables.ARTICLES[query.article][query.case][gender]
+    
     adjEnding = tables.ADJ_ENDINGS[query.article][query.case][gender]
+    if adjEnding[0] == query.adjective[-1]:
+        adjEnding = adjEnding[1:]
+
     decNoun = query.noun[nounKey]
     
     # noun details
     basicArt = tables.ARTICLES['bestimmter Artikel']['Nominativ'][gender]
     basicNoun = query.noun[f"nom-{'plu' if query.cardinality == 'Plural' else 'sin'}"]
 
-    if decNoun == "_":
+    if decNoun == "—":
         raise Exception("Invalid query")
     
     return Solution(f"{decArt} {query.adjective}{adjEnding} {decNoun}".strip(),