From b028228d3d118f39f55900ba6464296064776602 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Sun, 19 Feb 2017 11:55:32 -0500 Subject: [PATCH] Personal_wikis: Fix Category page deletion failing --- .../src/gplx/xowa/addons/wikis/searchs/Srch_search_addon.java | 2 +- .../src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java | 2 +- .../src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/Srch_search_addon.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/Srch_search_addon.java index 3e5aff9b3..10fea1cea 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/Srch_search_addon.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/Srch_search_addon.java @@ -34,7 +34,7 @@ public class Srch_search_addon implements Xoax_addon_itm, Srch_search_addon_api public void Search(Srch_search_qry qry, Srch_rslt_cbk cbk) {search_mgr.Search(qry, cbk);} public void Clear_rslts_cache() {search_mgr.Clear_rslts_cache();} public void Delete_links(int ns_id, int page_id) { - if (db_mgr.Tbl__link__len() == 0) return;// NOTE: personal_wikis may not have search_link; exit early else assert will fail; DATE:2017-02-15 + if (!db_mgr.Tbl__word().conn.Meta_tbl_exists(Srch_word_tbl.TABLE_NAME)) return; // NOTE: personal_wikis may not have search_link; exit early else assert will fail; DATE:2017-02-15 int search_link_db_id = db_mgr.Tbl__link__get_idx(ns_id); Srch_link_tbl search_link_tbl = db_mgr.Tbl__link__get_at(search_link_db_id); search_link_tbl.Delete(page_id); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java index 8988b2421..f560016fd 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java @@ -100,7 +100,7 @@ public class Srch_db_mgr { } } public void Update_links(int ns_id, int old_id, int new_id) { - if (this.Tbl__link__len() == 0) return;// NOTE: personal_wikis may not have search_link; exit early else assert will fail; DATE:2017-02-15 + if (!tbl__word.conn.Meta_tbl_exists(Srch_word_tbl.TABLE_NAME)) return; // NOTE: personal_wikis may not have search_link; exit early else assert will fail; DATE:2017-02-15 int search_link_db_id = this.Tbl__link__get_idx(ns_id); Srch_link_tbl search_link_tbl = this.Tbl__link__get_at(search_link_db_id); search_link_tbl.Update_page_id(old_id, new_id); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java index aebcffd9e..8343ddc29 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java @@ -24,7 +24,7 @@ public class Srch_word_tbl implements Rls_able { public final Db_conn conn; private Db_stmt stmt_insert, stmt_select_by; public Srch_word_tbl(Db_conn conn) { this.conn = conn; - this.tbl_name = "search_word"; + this.tbl_name = TABLE_NAME; this.fld_id = flds.Add_int_pkey("word_id"); this.fld_text = flds.Add_str("word_text", 255); this.fld_link_count = flds.Add_int("link_count"); @@ -77,4 +77,5 @@ public class Srch_word_tbl implements Rls_able { stmt_select_by = Db_stmt_.Rls(stmt_select_by); } public static final String Fld_link_score_min = "link_score_min", Fld_link_score_max = "link_score_max"; + public static final String TABLE_NAME = "search_word"; }