fix entry_id / sense_id

app.py

@@ -1804,13 +1804,13 @@ def _wiktionary_map_pos_key(wikt_pos: Optional[str]) -> str:
 
 def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection) -> Dict[str, Any]:
     """
-    (REVISED FOR FULL DB)
-    Fetches ALL associated data for a single Wiktionary entry_id,
-    making full use of the new '_full' normalized schema.
+    (REVISED FOR FULL DB V3)
+    Fetches ALL associated data for a single Wiktionary entry_id.
+    This version correctly queries expressions/proverbs by entry_id.
     """
     report = {}
     
-    # 1. Get Base Entry Info (with title and redirect)
+    # 1. Get Base Entry Info
     entry_data = conn.execute(
         "SELECT word, title, redirect, pos, pos_title, lang, etymology_text FROM entries WHERE id = ?", (entry_id,)
     ).fetchone()
@@ -1820,7 +1820,7 @@ def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection)
     report["entry_id"] = entry_id
     report["lemma"] = entry_data["word"]
 
-    # 2. Get Senses (with Glosses, Tags, Topics, Categories, Examples, Expressions, and Proverbs)
+    # 2. Get Senses (with Glosses, Tags, Topics, Categories, and Examples)
     senses_q = conn.execute(
         """
         SELECT 
@@ -1840,28 +1840,14 @@ def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection)
         sense_dict = dict(sense_row)
         sense_id = sense_dict["sense_id"]
         
-        # Get examples
+        # Get examples (linked to sense_id)
         examples_q = conn.execute(
             "SELECT text, ref, author, title, year, url FROM examples WHERE sense_id = ?", (sense_id,)
         ).fetchall()
         sense_dict["examples"] = [dict(ex) for ex in examples_q]
         
-        # --- NEW: Get expressions ---
-        expr_q = conn.execute(
-            "SELECT expression, sense_index FROM expressions WHERE sense_id = ?", (sense_id,)
-        ).fetchall()
-        sense_dict["expressions"] = [dict(ex) for ex in expr_q]
-        
-        # --- NEW: Get proverbs ---
-        prov_q = conn.execute(
-            "SELECT proverb, sense_index FROM proverbs WHERE sense_id = ?", (sense_id,)
-        ).fetchall()
-        sense_dict["proverbs"] = [dict(p) for p in prov_q]
-        
         senses_list.append(sense_dict)
     report["senses"] = senses_list
-    report["expressions_by_sense"] = [s["expressions"] for s in senses_list if s["expressions"]]
-    report["proverbs_by_sense"] = [s["proverbs"] for s in senses_list if s["proverbs"]]
 
     # 3. Get Inflected Forms (with Tags and Topics)
     forms_q = conn.execute(
@@ -1943,7 +1929,6 @@ def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection)
     ).fetchall()
     report["derived_terms"] = [dict(d) for d in derived_q]
     
-    # --- FIXED: Query related_terms with new columns ---
     related_q = conn.execute(
         "SELECT related_word, sense_index, raw_tags_json FROM related_terms WHERE entry_id = ?", (entry_id,)
     ).fetchall()
@@ -1960,25 +1945,20 @@ def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection)
     ).fetchall()
     report["entry_categories"] = [c["category"] for c in entry_cats_q]
 
-    # --- 11. GET ALL NEW OMITTED FIELDS ---
+    # --- 11. GET ALL NEW OMITTED FIELDS (linked to entry_id) ---
     
-    # entry_notes
     notes_q = conn.execute("SELECT note FROM entry_notes WHERE entry_id = ?", (entry_id,)).fetchall()
     report["entry_notes"] = [n["note"] for n in notes_q]
     
-    # other_pos
     other_pos_q = conn.execute("SELECT pos_value FROM other_pos WHERE entry_id = ?", (entry_id,)).fetchall()
     report["other_pos"] = [p["pos_value"] for p in other_pos_q]
     
-    # entry_raw_tags
     raw_tags_q = conn.execute("SELECT raw_tag FROM entry_raw_tags WHERE entry_id = ?", (entry_id,)).fetchall()
     report["raw_tags"] = [t["raw_tag"] for t in raw_tags_q]
     
-    # descendants
     desc_q = conn.execute("SELECT lang, word, roman FROM descendants WHERE entry_id = ?", (entry_id,)).fetchall()
     report["descendants"] = [dict(d) for d in desc_q]
     
-    # Semantic relations
     hyper_q = conn.execute("SELECT hypernym_word, sense_index FROM hypernyms WHERE entry_id = ?", (entry_id,)).fetchall()
     report["hypernyms"] = [dict(h) for h in hyper_q]
     
@@ -1991,7 +1971,6 @@ def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection)
     mero_q = conn.execute("SELECT meronym_word, sense_index FROM meronyms WHERE entry_id = ?", (entry_id,)).fetchall()
     report["meronyms"] = [dict(m) for m in mero_q]
     
-    # Coordinate terms (with their tags)
     coord_q = conn.execute(
         """
         SELECT 
@@ -2004,6 +1983,17 @@ def _wiktionary_build_report_for_entry(entry_id: int, conn: sqlite3.Connection)
     ).fetchall()
     report["coordinate_terms"] = [dict(c) for c in coord_q]
 
+    # --- FIXED: Query expressions and proverbs by entry_id ---
+    expr_q = conn.execute(
+        "SELECT expression, sense_index FROM expressions WHERE entry_id = ?", (entry_id,)
+    ).fetchall()
+    report["expressions"] = [dict(ex) for ex in expr_q]
+        
+    prov_q = conn.execute(
+        "SELECT proverb, sense_index FROM proverbs WHERE entry_id = ?", (entry_id,)
+    ).fetchall()
+    report["proverbs"] = [dict(p) for p in prov_q]
+
     return report
 
 def _wiktionary_find_all_entries(word: str, conn: sqlite3.Connection) -> List[Dict[str, Any]]: