Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.8.4.1

Browse Source
This commit is contained in:
gnosygnu
2014-08-24 23:14:26 -04:00
parent 7ee4326485
commit b0a01882de
109 changed files with 1470 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
400_xowa/src_120_wiki/gplx/xowa/Xow_wiki.java
View File

@@ -128,9 +128,9 @@ public class Xow_wiki implements GfoInvkAble {
file_mgr.Meta_mgr().Clear();
db_mgr.Load_mgr().Clear();
}
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl) {return GetPageByTtl(url, ttl, lang, app.Gui_mgr().Browser_win().Active_tab());}
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl, Xog_tab_itm tab) {return GetPageByTtl(url, ttl, lang, tab);}
private Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl, Xol_lang lang, Xog_tab_itm tab) {
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl) {return GetPageByTtl(url, ttl, lang, app.Gui_mgr().Browser_win().Active_tab(), true);}
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl, Xog_tab_itm tab) {return GetPageByTtl(url, ttl, lang, tab, true);}
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl, Xol_lang lang, Xog_tab_itm tab, boolean parse_page) {
if (init_needed) Init_wiki(app.User());
Xoa_page page = data_mgr.Get_page(url, ttl, false, false); // get page from data_mgr
if (page.Missing()) { // page doesn't exist
@@ -138,7 +138,7 @@ public class Xow_wiki implements GfoInvkAble {
Xow_wiki commons_wiki = app.Wiki_mgr().Get_by_key_or_null(commons_wiki_key);
if (commons_wiki != null
&& !Bry_.Eq(domain_bry, commons_wiki.Domain_bry())) // if file, check commons wiki; note that !Bry_.Eq is recursion guard
return commons_wiki.GetPageByTtl(url, ttl, this.lang, tab);
return commons_wiki.GetPageByTtl(url, ttl, this.lang, tab, true);
}
else
return page.Missing_();
@@ -146,15 +146,14 @@ public class Xow_wiki implements GfoInvkAble {
if (page.Missing()) return page; // NOTE: commons can return null page
page.Tab_(tab);
page.Lang_(lang);
gplx.xowa.xtns.scribunto.Scrib_core.Core_page_changed(page); // notify scribunto about page changed
ParsePage(page, false); // NOTE: do not clear page b/c reused for search
if (parse_page)
ParsePage(page, false); // NOTE: do not clear page b/c reused for search
return page;
}
public void ParsePage_root(Xoa_page page, boolean clear) {
ParsePage(page, clear);
}
public void ParsePage_root(Xoa_page page, boolean clear) {ParsePage(page, clear);}
public void ParsePage(Xoa_page page, boolean clear) {
if (init_needed && !Env_.Mode_testing()) Init_wiki(app.User());
gplx.xowa.xtns.scribunto.Scrib_core.Core_page_changed(page); // notify scribunto about page changed
ctx.Cur_page_(page);
Xop_root_tkn root = ctx.Tkn_mkr().Root(page.Data_raw());
if (clear) {page.Clear();}
@@ -224,8 +223,9 @@ public class Xow_wiki implements GfoInvkAble {
if (sqlite_url != null) {
Xodb_mgr_sql db_mgr_sql = this.Db_mgr_create_as_sql();
db_mgr_sql.Init_load(gplx.dbs.Db_connect_.sqlite_(sqlite_url));
db_mgr_sql.Html_mgr().Enabled_(hdump_enabled);
db_mgr_sql.Html_db_enabled_(hdump_enabled);
}
if (!Xob_import_marker.Check(this)) {app.Wiki_mgr().Del(domain_bry); init_needed = false; return;} // NOTE: must call after Db_mgr_create_as_sql(); also, must delete wiki from mgr; DATE:2014-08-24
db_mgr.Load_mgr().Load_init(this);
app.Gfs_mgr().Run_url_for(this, fsys_mgr.Cfg_wiki_core_fil());
gplx.xowa.utls.upgrades.Xoa_upgrade_mgr.Check(this);

14
400_xowa/src_120_wiki/gplx/xowa/Xowc_parser.java
View File

@@ -21,12 +21,16 @@ public class Xowc_parser implements GfoInvkAble {
public Xowc_parser(Xow_wiki wiki) {
lnki_cfg = new Xoc_lnki_cfg(wiki);
}
public boolean Flag_xtns_pages_init() {return flag_xtns_pages_init;} public Xowc_parser Flag_xtns_pages_init_(boolean v) {flag_xtns_pages_init = v; return this;} private boolean flag_xtns_pages_init = true;
public Xoc_lnki_cfg Lnki_cfg() {return lnki_cfg;} private Xoc_lnki_cfg lnki_cfg;
public Xowc_xtns Xtns() {return xtns;} private Xowc_xtns xtns = new Xowc_xtns();
public boolean Display_title_restrict() {return display_title_restrict;} public void Display_title_restrict_(boolean v) {display_title_restrict = v;} private boolean display_title_restrict = true;
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_xtns)) return xtns;
else if (ctx.Match(k, Invk_lnki)) return lnki_cfg;
else return GfoInvkAble_.Rv_unhandled;
} private static final String Invk_xtns = "xtns", Invk_lnki = "lnki";
if (ctx.Match(k, Invk_xtns)) return xtns;
else if (ctx.Match(k, Invk_lnki)) return lnki_cfg;
else if (ctx.Match(k, Invk_display_title_restrict)) return display_title_restrict;
else if (ctx.Match(k, Invk_display_title_restrict_)) display_title_restrict = m.ReadYn("v");
else return GfoInvkAble_.Rv_unhandled;
return this;
}
private static final String Invk_xtns = "xtns", Invk_lnki = "lnki", Invk_display_title_restrict = "display_title_restrict", Invk_display_title_restrict_ = "display_title_restrict_";
}