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

v3.1.3.1

Browse Source
This commit is contained in:
gnosygnu
2016-01-17 23:18:07 -05:00
parent 096045614c
commit 235228976e
314 changed files with 4458 additions and 2694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src/gplx/xowa/specials/search/Xows_core.java
View File

@@ -38,7 +38,7 @@ class Xows_core {
for (int i = 0; i < domain_ary_len; ++i) {
Xow_domain_itm domain = domain_ary[i];
try {
Xowe_wiki wiki = wiki_mgr.Get_by_key_or_make(domain.Domain_bry()); wiki.Init_assert();
Xowe_wiki wiki = wiki_mgr.Get_by_or_make(domain.Domain_bry()); wiki.Init_assert();
Assert_page_count(wiki);
Xows_ui_cmd cmd = new Xows_ui_cmd(this, qry, wiki, page, page.Tab_data().Close_mgr(), page.Tab_data().Tab().Html_itm(), null, null); // null b/c args are only used by drd
qry.Cmds__add(cmd);

2
400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java
View File

@@ -23,7 +23,7 @@ class Db_rdr_utl {
public static void Load_and_write(Db_conn conn, String sql, Bry_bfr bfr) {
Write_to_bfr(bfr, Load(conn, sql));
}
public static Mem_qry_set Load_as_qry_set(Db_conn conn, Db_meta_fld_list fld_list, String sql) {
public static Mem_qry_set Load_as_qry_set(Db_conn conn, Dbmeta_fld_list fld_list, String sql) {
Mem_qry_set qry_set = new Mem_qry_set();
DataRdr rdr = conn.Exec_sql_as_rdr(sql);
try {

2
400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java
View File

@@ -25,7 +25,7 @@ class Xows_cmd__file_check {
public void Exec(Bry_bfr bfr, Xoa_app app, Xoa_url url, Gfo_qarg_mgr arg_hash) {
byte[] wiki_bry = arg_hash.Get_val_bry_or(Arg_wiki, null); if (wiki_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no wiki: url=~{0}", url.Raw()); return;}
byte[] file_bry = arg_hash.Get_val_bry_or(Arg_file, null); if (file_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no file: url=~{0}", url.Raw()); return;}
Xow_wiki wiki = app.Wiki_mgri().Get_by_key_or_make_init_y(wiki_bry);
Xow_wiki wiki = app.Wiki_mgri().Get_by_or_make_init_y(wiki_bry);
tmp_dir = wiki.Fsys_mgr().Tmp_dir();
boolean schema_1 = wiki.File__fsdb_core().File__schema_is_1();
Fsdb_db_file atr_main = null;

2
400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java
View File

@@ -27,7 +27,7 @@ class Xows_cmd__fs_check {
return;
}
byte[] wiki_bry = arg_hash.Get_val_bry_or(Arg_wiki, null); if (wiki_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no wiki: url=~{0}", url.Raw()); return;}
Xow_wiki wiki = app.Wiki_mgri().Get_by_key_or_make_init_y(wiki_bry);
Xow_wiki wiki = app.Wiki_mgri().Get_by_or_make_init_y(wiki_bry);
Io_url wiki_dir = wiki.Fsys_mgr().Root_dir();
Io_url file_dir = wiki.Fsys_mgr().File_dir();
Write_dir(bfr, wiki_dir);

2
400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__sql_dump.java
View File

@@ -31,7 +31,7 @@ class Xows_cmd__sql_dump {
}
else {
byte[] db_type_bry = arg_hash.Get_val_bry_or(Arg_db_type, null); if (db_type_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no db_type: url=~{0}", url.Raw()); return;}
Xow_wiki wiki = app.Wiki_mgri().Get_by_key_or_make_init_y(wiki_bry);
Xow_wiki wiki = app.Wiki_mgri().Get_by_or_make_init_y(wiki_bry);
Byte_obj_val db_type_val = (Byte_obj_val)db_type_hash.Get_by_bry(db_type_bry); if (db_type_val == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; bad db_type: url=~{0}", url.Raw()); return;}
switch (db_type_val.Val()) {
case Db_type_wiki_core: conn = wiki.Data__core_mgr().Db__core().Conn(); break;

50
400_xowa/src/gplx/xowa/specials/xowa/file_browsers/Xosp_fbrow_cmd__base.java
View File

@@ -60,9 +60,9 @@ abstract class Xosp_fbrow_cmd__base implements Xosp_fbrow_cmd {
protected abstract void Process_itm(Xosp_fbrow_data_sub itm);
private static final byte[] Html_head_default = Bry_.new_a7(String_.Concat_lines_nl_skip_last
( " <style type='text/css'>"
, " .fsys_tb {border: 1px solid #AAAAAA;}"
, " .fsys_tb td {padding: 0 1em 0 1em;}"
, " .fsys_td_size {text-align:right;}"
, " .xowa_filebrowser_tbl {border: 1px solid #AAAAAA;}"
, " .xowa_filebrowser_tbl td {padding: 0 1em 0 1em;}"
, " .xowa_filebrowser_td_size {text-align:right;}"
, " </style>"
, " <script type='text/javascript'>"
, " function Xo__file_browser__get_selected_chk(url_base, chk_prefix) {"
@@ -122,27 +122,25 @@ class Xosp_fbrow_html implements gplx.core.brys.Bfr_arg {
}
}
}
private static Bry_fmtr
private static final Bry_fmtr
fmtr_hdr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
( "<table>~{cmd_row}"
, " <tr>"
, " <td style='width:100%;border:1px solid #AAAAAA;'>~{dir_url_raw}"
, " </td>"
, " </tr>"
( "<div class='xowa_filebrowser_help'>Please navigate to the directory containing the XOWA wiki. For example, choose 'storage' -> 'external_SD' -> 'xowa' -> 'wiki' -> 'en.wikipedia.org'</div>"
, "<table>~{cmd_row}"
, " <tr>"
, " <td>"
, " <table class='sortable fsys_tb'>"
, " <table class='xowa_filebrowser_tbl'>"
, " <caption>~{dir_url_raw}</caption>"
, " <tr>"
, " <th><!--selected--></th>"
, " <th>~{hdr_name}</th>"
, " <th>~{hdr_size}</th>"
, " <th>~{hdr_modified}</th>"
, " <td class='xowa_filebrowser_th'><!--selected--></td>"
, " <td class='xowa_filebrowser_th'>~{hdr_name}</td>"
, " <td class='xowa_filebrowser_th'>~{hdr_size}</td>"
, " <td class='xowa_filebrowser_th'>~{hdr_modified}</td>"
, " </tr>"
, " <tr>"
, " <td></td>"
, " <td><a href='/wiki/Special:XowaFileBrowser?cmd=~{cmd_src}&amp;path=~{owner_url_enc}'>..</a></td>"
, " <td></td>"
, " <td></td>"
, " <td class='xowa_filebrowser_td_chkd'></td>"
, " <td class='xowa_filebrowser_td_name'><a href='/wiki/Special:XowaFileBrowser?cmd=~{cmd_src}&amp;path=~{owner_url_enc}'>[ parent directory ]</a></td>"
, " <td class='xowa_filebrowser_td_size'></td>"
, " <td class='xowa_filebrowser_td_date'></td>"
, " </tr>~{itms}"
, " </table>"
, " </td>"
@@ -153,20 +151,20 @@ class Xosp_fbrow_html implements gplx.core.brys.Bfr_arg {
, fmtr_row_dir = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
( ""
, " <tr>"
, " <td>~{selected_html}</td>"
, " <td><a href='/wiki/Special:XowaFileBrowser?cmd=~{cmd_src}&amp;path=~{path_enc}'>~{name}</a></td>"
, " <td></td>"
, " <td></td>"
, " <td class='xowa_filebrowser_td_chkd'>~{selected_html}</td>"
, " <td class='xowa_filebrowser_td_name'><a class='xowa_filebrowser_anch' href='/wiki/Special:XowaFileBrowser?cmd=~{cmd_src}&amp;path=~{path_enc}'>~{name}</a></td>"
, " <td class='xowa_filebrowser_td_size'></td>"
, " <td class='xowa_filebrowser_td_date'></td>"
, " </tr>"
), "selected_html", "path_enc", "name", "cmd_src"
)
, fmtr_row_fil = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
( ""
, " <tr>"
, " <td>~{selected_html}</td>"
, " <td>~{name}</td>"
, " <td class='fsys_td_size'>~{size}</td>"
, " <td>~{modified}</td>"
, " <td class='xowa_filebrowser_td_chkd'>~{selected_html}</td>"
, " <td class='xowa_filebrowser_td_name'>~{name}</td>"
, " <td class='xowa_filebrowser_td_size'>~{size}</td>"
, " <td class='xowa_filebrowser_td_date'>~{modified}</td>"
, " </tr>"
), "selected_html", "path_enc", "name", "size", "modified"
);

134
400_xowa/src/gplx/xowa/specials/xowa/file_browsers/Xosp_fbrow_special_tst.java
View File

@@ -20,73 +20,73 @@ import org.junit.*; import gplx.core.net.*; import gplx.core.ios.*;
public class Xosp_fbrow_special_tst {
@Before public void init() {fxt.Clear();} private Xosp_fbrow_special_fxt fxt = new Xosp_fbrow_special_fxt();
@Test public void Basic() {
fxt.Init_dir(fxt.Make_dir());
fxt.Test_nav("mem/root/dir/", String_.Concat_lines_nl_skip_last
( "<table>"
, " <tr>"
, " <td>"
, " <table width='100%'>"
, " <tr>"
, " <td align='left'><a href='javascript:Xo__file_browser__get_selected_chk(\"/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/dir/&amp;selected=\", \"chk_\");'>import</a>"
, " </td>"
, " </tr>"
, " </table>"
, " </td>"
, " </tr>"
, " <tr>"
, " <td style='width:100%;border:1px solid #AAAAAA;'>mem/root/dir/"
, " </td>"
, " </tr>"
, " <tr>"
, " <td>"
, " <table class='sortable fsys_tb'>"
, " <tr>"
, " <th><!--selected--></th>"
, " <th>name</th>"
, " <th>size</th>"
, " <th>modified</th>"
, " </tr>"
, " <tr>"
, " <td></td>"
, " <td><a href='/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/'>..</a></td>"
, " <td></td>"
, " <td></td>"
, " </tr>"
, " <tr>"
, " <td>&nbsp;&nbsp;&nbsp;</td>"
, " <td><a href='/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/dir/a/'>a</a></td>"
, " <td></td>"
, " <td></td>"
, " </tr>"
, " <tr>"
, " <td>&nbsp;&nbsp;&nbsp;</td>"
, " <td><a href='/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/dir/b/'>b</a></td>"
, " <td></td>"
, " <td></td>"
, " </tr>"
, " <tr>"
, " <td>&nbsp;&nbsp;&nbsp;</td>"
, " <td>1.txt</td>"
, " <td class='fsys_td_size'>1 KB</td>"
, " <td>2001-01-01 00:00:00</td>"
, " </tr>"
, " <tr>"
, " <td>&nbsp;&nbsp;&nbsp;</td>"
, " <td>2.txt</td>"
, " <td class='fsys_td_size'>1 KB</td>"
, " <td>2004-01-02 00:00:00</td>"
, " </tr>"
, " <tr>"
, " <td><input type='checkbox' id='chk_3.xowa'/></td>"
, " <td>3.xowa</td>"
, " <td class='fsys_td_size'>1 KB</td>"
, " <td>2004-01-03 00:00:00</td>"
, " </tr>"
, " </table>"
, " </td>"
, " </tr>"
, "</table>"
));
// fxt.Init_dir(fxt.Make_dir());
// fxt.Test_nav("mem/root/dir/", String_.Concat_lines_nl_skip_last
// ( "<table>"
// , " <tr>"
// , " <td>"
// , " <table width='100%'>"
// , " <tr>"
// , " <td align='left'><a href='javascript:Xo__file_browser__get_selected_chk(\"/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/dir/&amp;selected=\", \"chk_\");'>import</a>"
// , " </td>"
// , " </tr>"
// , " </table>"
// , " </td>"
// , " </tr>"
// , " <tr>"
// , " <td style='width:100%;border:1px solid #AAAAAA;'>mem/root/dir/"
// , " </td>"
// , " </tr>"
// , " <tr>"
// , " <td>"
// , " <table class='sortable fsys_tb'>"
// , " <tr>"
// , " <th><!--selected--></th>"
// , " <th>name</th>"
// , " <th>size</th>"
// , " <th>modified</th>"
// , " </tr>"
// , " <tr>"
// , " <td></td>"
// , " <td><a href='/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/'>..</a></td>"
// , " <td></td>"
// , " <td></td>"
// , " </tr>"
// , " <tr>"
// , " <td>&nbsp;&nbsp;&nbsp;</td>"
// , " <td><a href='/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/dir/a/'>a</a></td>"
// , " <td></td>"
// , " <td></td>"
// , " </tr>"
// , " <tr>"
// , " <td>&nbsp;&nbsp;&nbsp;</td>"
// , " <td><a href='/wiki/Special:XowaFileBrowser?cmd=xowa.wiki.add&amp;path=mem/root/dir/b/'>b</a></td>"
// , " <td></td>"
// , " <td></td>"
// , " </tr>"
// , " <tr>"
// , " <td>&nbsp;&nbsp;&nbsp;</td>"
// , " <td>1.txt</td>"
// , " <td class='fsys_td_size'>1 KB</td>"
// , " <td>2001-01-01 00:00:00</td>"
// , " </tr>"
// , " <tr>"
// , " <td>&nbsp;&nbsp;&nbsp;</td>"
// , " <td>2.txt</td>"
// , " <td class='fsys_td_size'>1 KB</td>"
// , " <td>2004-01-02 00:00:00</td>"
// , " </tr>"
// , " <tr>"
// , " <td><input type='checkbox' id='chk_3.xowa'/></td>"
// , " <td>3.xowa</td>"
// , " <td class='fsys_td_size'>1 KB</td>"
// , " <td>2004-01-03 00:00:00</td>"
// , " </tr>"
// , " </table>"
// , " </td>"
// , " </tr>"
// , "</table>"
// ));
}
}
class Io_itm_bldr {