From fa056807d557e4d9bf2a2e91126c24a9c8e17311 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Tue, 21 Feb 2017 16:59:59 -0500 Subject: [PATCH] Personal_wikis: Change json name from 'main_page' to 'mainpage' --- .../xowa/addons/wikis/directorys/dbs/Xowdir_wiki_json.java | 4 ++-- .../wikis/directorys/specials/items/Xowdir_item_doc.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_json.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_json.java index e8d04d9e9..79e221757 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_json.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_json.java @@ -27,7 +27,7 @@ public class Xowdir_wiki_json { wtr.Nde_bgn("core"); wtr.Kv_str("name", name); - wtr.Kv_str("main_page", main_page); + wtr.Kv_str("mainpage", main_page); wtr.Nde_end(); wtr.Doc_nde_end(); @@ -37,7 +37,7 @@ public class Xowdir_wiki_json { public static Xowdir_wiki_json New_by_json(Json_parser json_parser, String json) { Json_doc jdoc = json_parser.Parse(json); String name = jdoc.Get_val_as_str_or(Bry_.Ary("core", "name"), ""); - String main_page = jdoc.Get_val_as_str_or(Bry_.Ary("core", "main_page"), ""); + String main_page = jdoc.Get_val_as_str_or(Bry_.Ary("core", "mainpage"), ""); return new Xowdir_wiki_json(name, main_page); } public static Xowdir_wiki_json New_empty() { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java index 939168f2c..4978bd5ac 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java @@ -32,7 +32,7 @@ public class Xowdir_item_doc implements Mustache_doc_itm { else if (String_.Eq(key, "domain")) bfr.Add_str_u8(domain); else if (String_.Eq(key, "name")) bfr.Add_str_u8(name); else if (String_.Eq(key, "dir")) bfr.Add_str_u8(dir); - else if (String_.Eq(key, "main_page")) bfr.Add_str_u8(main_page); + else if (String_.Eq(key, "mainpage")) bfr.Add_str_u8(main_page); else return false; return true; }