From 5eaaae0749cd17b4bde17a10542b03b09f5803fa Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Fri, 2 Dec 2016 14:44:31 -0500 Subject: [PATCH] Cfg: Remove nde_tid; convert checkbox yes to bool --- .../src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_db_mgr.java | 5 +++++ .../gplx/xowa/addons/apps/cfgs/dbs/Xocfg_itm_bldr.java | 4 ++-- .../gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_itm.java | 4 +--- .../gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_tbl.java | 8 +++----- .../apps/cfgs/specials/items/Xocfg_item_bridge.java | 2 +- .../apps/cfgs/specials/lists/Xocfg_list_bridge.java | 6 +++--- .../apps/cfgs/specials/lists/Xocfg_list_bridge_mgr.java | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_db_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_db_mgr.java index 200a32c60..2c2853965 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_db_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_db_mgr.java @@ -43,6 +43,11 @@ public class Xocfg_db_mgr { public void Set_str(String ctx, String key, String val) { Xoitm_meta_itm meta_itm = tbl__itm_meta.Select_by_key_or_null(key); if (meta_itm == null) throw Err_.new_wo_type("cfg not defined", "ctx", ctx, "key", key); + + // parse val + if (meta_itm.Gui_type() == Xoitm_gui_tid.Tid__checkbox) { + val = String_.Eq(val, "on") ? "true" : "false"; + } tbl__itm_data.Upsert(meta_itm.Id(), ctx, val, Datetime_now.Get().XtoUtc().XtoStr_fmt_iso_8561()); } public void Del(String ctx, String key) { diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_itm_bldr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_itm_bldr.java index 616e1a5bb..821fb12ef 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_itm_bldr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xocfg_itm_bldr.java @@ -33,7 +33,7 @@ public class Xocfg_itm_bldr { db_mgr.Tbl__grp_map().Upsert(owner_id, grp_id, map_sort); // insert nde_i18n - db_mgr.Tbl__nde_i18n().Upsert(Xonde_i18n_nde_tid.Tid__grp, grp_id, Lang__dflt, grp_name, grp_help); + db_mgr.Tbl__nde_i18n().Upsert(grp_id, Lang__dflt, grp_name, grp_help); } public void Create_itm(String grp_key, String itm_key, String scope_id_str, String gui_type, String gui_args, String itm_dflt, String itm_name, String help) { // insert itm_meta @@ -48,6 +48,6 @@ public class Xocfg_itm_bldr { db_mgr.Tbl__grp_map().Upsert(grp_id, itm_id, itm_sort); // insert nde_i18n - db_mgr.Tbl__nde_i18n().Upsert(Xonde_i18n_nde_tid.Tid__itm, itm_id, Lang__dflt, itm_name, help); + db_mgr.Tbl__nde_i18n().Upsert(itm_id, Lang__dflt, itm_name, help); } } diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_itm.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_itm.java index bb574b4cd..62f894fdb 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_itm.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_itm.java @@ -17,15 +17,13 @@ along with this program. If not, see . */ package gplx.xowa.addons.apps.cfgs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; public class Xonde_i18n_itm { - public Xonde_i18n_itm(int id, int tid, String lang, String name, String help) { + public Xonde_i18n_itm(int id, String lang, String name, String help) { this.id = id; - this.tid = tid; this.lang = lang; this.name = name; this.help = help; } public int Id() {return id;} private final int id; - public int Tid() {return tid;} private final int tid; public String Lang() {return lang;} private final String lang; public String Name() {return name;} private final String name; public String Help() {return help;} private final String help; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_tbl.java index 4a4732f85..68888880b 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/Xonde_i18n_tbl.java @@ -19,13 +19,12 @@ package gplx.xowa.addons.apps.cfgs.dbs; import gplx.*; import gplx.xowa.*; impor import gplx.dbs.*; import gplx.dbs.utls.*; public class Xonde_i18n_tbl implements Db_tbl { private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); - private final String fld__nde_tid, fld__nde_id, fld__nde_lang, fld__nde_name, fld__nde_help; + private final String fld__nde_id, fld__nde_lang, fld__nde_name, fld__nde_help; private final Db_conn conn; public Xonde_i18n_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "cfg_nde_i18n"; this.fld__nde_id = flds.Add_int_pkey("nde_id"); // EX: '2' - this.fld__nde_tid = flds.Add_int("nde_tid"); // EX: 1=grp; 2=itm this.fld__nde_lang = flds.Add_str("nde_lang", 16); // EX: 'en' this.fld__nde_name = flds.Add_str("nde_name", 255); // EX: 'Cfg Name' this.fld__nde_help = flds.Add_str("nde_help", 4096); // EX: 'Help text' @@ -33,8 +32,8 @@ public class Xonde_i18n_tbl implements Db_tbl { } public String Tbl_name() {return tbl_name;} private final String tbl_name; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} - public void Upsert(int nde_tid, int nde_id, String nde_lang, String nde_name, String nde_help) { - Db_tbl__crud_.Upsert(conn, tbl_name, flds, String_.Ary(fld__nde_id, fld__nde_tid, fld__nde_lang), nde_id, nde_tid, nde_lang, nde_name, nde_help); + public void Upsert(int nde_id, String nde_lang, String nde_name, String nde_help) { + Db_tbl__crud_.Upsert(conn, tbl_name, flds, String_.Ary(fld__nde_id, fld__nde_lang), nde_id, nde_lang, nde_name, nde_help); } public Xonde_i18n_itm Select_by_id_or_null(int id) { Db_rdr rdr = conn.Stmt_select(tbl_name, flds, fld__nde_id).Crt_int(fld__nde_id, id).Exec_select__rls_auto(); @@ -44,7 +43,6 @@ public class Xonde_i18n_tbl implements Db_tbl { private Xonde_i18n_itm Load(Db_rdr rdr) { return new Xonde_i18n_itm ( rdr.Read_int(fld__nde_id) - , rdr.Read_int(fld__nde_tid) , rdr.Read_str(fld__nde_lang) , rdr.Read_str(fld__nde_name) , rdr.Read_str(fld__nde_help) diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/items/Xocfg_item_bridge.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/items/Xocfg_item_bridge.java index d3a4057b3..e72d11f0d 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/items/Xocfg_item_bridge.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/items/Xocfg_item_bridge.java @@ -53,6 +53,6 @@ public class Xocfg_item_bridge implements Bridge_cmd_itm { .Add_str_byte("upsert" , Proc__upsert) ; - public byte[] Key() {return BRIDGE_KEY;} public static final byte[] BRIDGE_KEY = Bry_.new_a7("cfg.item.exec"); + public byte[] Key() {return BRIDGE_KEY;} public static final byte[] BRIDGE_KEY = Bry_.new_a7("cfg.maint"); public static final Xocfg_item_bridge Prototype = new Xocfg_item_bridge(); Xocfg_item_bridge() {} } diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge.java index 579c210be..74ef15e81 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge.java @@ -29,16 +29,16 @@ public class Xocfg_list_bridge implements Bridge_cmd_itm { byte proc_id = proc_hash.Get_as_byte_or(data.Get_as_bry_or(Bridge_cmd_mgr.Msg__proc, null), Byte_ascii.Max_7_bit); Json_nde args = data.Get_kv(Bridge_cmd_mgr.Msg__args).Val_as_nde(); switch (proc_id) { - case Proc__save: mgr.Save(args); break; + case Proc__upsert: mgr.Upsert(args); break; case Proc__revert: mgr.Revert(args); break; default: throw Err_.new_unhandled_default(proc_id); } return Bridge_cmd_mgr.Msg__ok; } - private static final byte Proc__save = 0, Proc__revert = 1; + private static final byte Proc__upsert = 0, Proc__revert = 1; private static final Hash_adp_bry proc_hash = Hash_adp_bry.cs() - .Add_str_byte("save" , Proc__save) + .Add_str_byte("upsert" , Proc__upsert) .Add_str_byte("revert" , Proc__revert) ; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge_mgr.java index fba056672..943892d83 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/lists/Xocfg_list_bridge_mgr.java @@ -23,7 +23,7 @@ public class Xocfg_list_bridge_mgr { public Xocfg_list_bridge_mgr(Xoa_app app) { this.db_mgr = new Xocfg_db_mgr(app.User().User_db_mgr().Conn()); } - public void Save(Json_nde args) { + public void Upsert(Json_nde args) { String ctx = args.Get_as_str("ctx"); String key = args.Get_as_str("key"); String val = args.Get_as_str("val");