""; also bounds check
byte b = src[txt_pos];
if (bgn_pos == Xop_parser_.Doc_bgn_bos) { // BOS; gobble up all \s\t; EX: "BOS\s\s\sa" -> "BOSa"
- if (b == Byte_ascii.NewLine) { // next char is nl
+ if (b == Byte_ascii.Nl) { // next char is nl
cur_pos = txt_pos; // position at nl; NOTE: do not position after nl, else may break hdr, tblw, list, etc; EX: "\s\n{|" needs to preserve "\n" for tblw
ctx.Subs_add(root, tkn_mkr.Ignore(bgn_pos, cur_pos, Xop_ignore_tkn.Ignore_tid_pre_at_bos));
return cur_pos; // ignore pre if blank line at bos; EX: "BOS\s\s\n" -> "BOS\n"
@@ -74,7 +74,7 @@ public class Xop_pre_lxr implements Xop_lxr {
return ctx.Para().Process_pre(ctx, tkn_mkr, root, src, src_len, bgn_pos, cur_pos, txt_pos);
}
public static final Xop_pre_lxr _ = new Xop_pre_lxr(); Xop_pre_lxr() {}
- private static final byte[] Hook_space = new byte[] {Byte_ascii.NewLine, Byte_ascii.Space};
+ private static final byte[] Hook_space = new byte[] {Byte_ascii.Nl, Byte_ascii.Space};
}
/*
NOTE_4: Close_all_lists_unless_category; PAGE:en.w:SHA-2
diff --git a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_lxr.java b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_lxr.java
index 8bdef2f58..977d9603c 100644
--- a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_lxr.java
+++ b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_lxr.java
@@ -47,14 +47,14 @@ public class Xop_tblw_lxr implements Xop_lxr {
}
else { // \n| or \n! but no tbl
if ( bgn_pos != Xop_parser_.Doc_bgn_bos // avoid ! at BOS
- && src[bgn_pos] == Byte_ascii.NewLine) // handle "!" etc.
+ && src[bgn_pos] == Byte_ascii.Nl) // handle "!" etc.
return Xop_tblw_wkr.Handle_false_tblw_match(ctx, root, src, bgn_pos, cur_pos, tkn_mkr.Txt(bgn_pos + 1, cur_pos), true); // +1 to ignore \n of "\n!", "\n!!", "\n|"; DATE:2014-02-19
else // handle "!!" only
return ctx.Lxr_make_txt_(cur_pos);
}
}
if (wlxr_type == Xop_tblw_wkr.Tblw_type_th2) { // !!; extra check to make sure \n! exists; DATE:2014-10-19
- int prv_th_pos = Bry_finder.Find_bwd(src, Byte_ascii.NewLine, bgn_pos); // search for previous \n
+ int prv_th_pos = Bry_finder.Find_bwd(src, Byte_ascii.Nl, bgn_pos); // search for previous \n
boolean invalid = prv_th_pos == Bry_finder.Not_found; // no \n; invalid
if (!invalid) {
++prv_th_pos; // skip \n
diff --git a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java
index aa335d980..3fce1452f 100644
--- a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java
@@ -150,7 +150,7 @@ public class Xop_tblw_wkr implements Xop_ctx_wkr {
if (ignore_prv) {
ctx.Subs_add(root, tkn_mkr.Ignore(bgn_pos, cur_pos, Xop_ignore_tkn.Ignore_tid_htmlTidy_tblw));
++tblw_te_ignore_count;
- cur_pos = Bry_finder.Find_fwd_until(src, cur_pos, src_len, Byte_ascii.NewLine); // NOTE: minor hack; this tblw tkn will be ignored, so ignore any of its attributes as well; gobble up all chars till nl. see: if two consecutive tbs, ignore attributes on 2nd; en.wikibooks.org/wiki/Wikibooks:Featured books
+ cur_pos = Bry_finder.Find_fwd_until(src, cur_pos, src_len, Byte_ascii.Nl); // NOTE: minor hack; this tblw tkn will be ignored, so ignore any of its attributes as well; gobble up all chars till nl. see: if two consecutive tbs, ignore attributes on 2nd; en.wikibooks.org/wiki/Wikibooks:Featured books
return cur_pos;
}
if (auto_create) {
diff --git a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_ws_itm.java b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_ws_itm.java
index fbf11d8ff..2bfa9d87d 100644
--- a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_ws_itm.java
+++ b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_ws_itm.java
@@ -32,7 +32,7 @@ public class Xop_tblw_ws_itm {
trie_itm(rv, Type_th, Xop_tblw_lxr_ws.Hook_th);
trie_itm(rv, Type_tc, Xop_tblw_lxr_ws.Hook_tc);
trie_itm(rv, Type_td, Bry_.bytes_(Byte_ascii.Pipe));
- trie_itm(rv, Type_nl, Bry_.bytes_(Byte_ascii.NewLine));
+ trie_itm(rv, Type_nl, Bry_.bytes_(Byte_ascii.Nl));
trie_itm_xnde(rv, Xop_xnde_tag_.Tag_table);
trie_itm_xnde(rv, Xop_xnde_tag_.Tag_tr);
trie_itm_xnde(rv, Xop_xnde_tag_.Tag_td);
diff --git a/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java b/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java
index 996e8d5d9..c859f16c2 100644
--- a/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java
+++ b/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java
@@ -43,7 +43,7 @@ public class Nowiki_escape_itm {
}
return dirty;
}
- private static final byte[] Pre_bry = new byte[] {Byte_ascii.NewLine, Byte_ascii.Space}; // NOTE: must go before trie_new
+ private static final byte[] Pre_bry = new byte[] {Byte_ascii.Nl, Byte_ascii.Space}; // NOTE: must go before trie_new
private static final Btrie_slim_mgr trie = trie_new();
private static Btrie_slim_mgr trie_new() {
Btrie_slim_mgr rv = Btrie_slim_mgr.cs_();
@@ -57,7 +57,7 @@ public class Nowiki_escape_itm {
trie_new_itm(rv, Byte_ascii.Asterisk_bry , Xop_amp_trie.Bry_xowa_asterisk);
trie_new_itm(rv, Byte_ascii.Dash_bry , Xop_amp_trie.Bry_xowa_dash); // needed to handle "|-"; PAGE:de.w:Liste_von_Vereinen_und_Vereinigungen_von_Gl�ubigen_(r�misch-katholische_Kirche) DATE:2015-01-08
trie_new_itm(rv, Byte_ascii.Space_bry , Xop_amp_trie.Bry_xowa_space);
- trie_new_itm(rv, Byte_ascii.NewLine_bry , Xop_amp_trie.Bry_xowa_nl);
+ trie_new_itm(rv, Byte_ascii.Nl_bry , Xop_amp_trie.Bry_xowa_nl);
trie_new_itm(rv, Pre_bry , Pre_bry);
return rv;
}
diff --git a/400_xowa/src/gplx/xowa/servers/Gxw_html_server.java b/400_xowa/src/gplx/xowa/servers/Gxw_html_server.java
index 8e5738b7e..758953dd4 100644
--- a/400_xowa/src/gplx/xowa/servers/Gxw_html_server.java
+++ b/400_xowa/src/gplx/xowa/servers/Gxw_html_server.java
@@ -16,54 +16,25 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.servers; import gplx.*; import gplx.xowa.*;
-import gplx.core.primitives.*; import gplx.gfui.*;
+import gplx.core.primitives.*; import gplx.core.js.*;
+import gplx.gfui.*;
import gplx.xowa.servers.tcp.*;
import gplx.xowa.servers.http.*; import gplx.xowa.gui.views.*;
public class Gxw_html_server implements Gxw_html {
private Xosrv_socket_wtr wtr; private Gfo_usr_dlg usr_dlg;
- private Gfui_html_cfg cfg;
+ private final Js_wtr js_wtr = new Js_wtr();
public Gxw_html_server(Gfo_usr_dlg usr_dlg, Xosrv_socket_wtr wtr) {
- this.usr_dlg = usr_dlg; this.wtr = wtr;
- cfg = Swt_kit._.Html_cfg();
+ this.usr_dlg = usr_dlg; this.wtr = wtr;
}
- public String Html_doc_html() {return Exec(cfg.Doc_html());}
- public void Html_doc_html_load_by_mem(String html) {Exec("location.reload(true);");} // HACK: force reload of page
- public void Html_doc_html_load_by_url(String path, String html) {Exec("location.reload(true);");} // HACK: force reload of page
+ public void Html_doc_html_load_by_mem(String html) {Exec_as_str("location.reload(true);");} // HACK: force reload of page
+ public void Html_doc_html_load_by_url(String path, String html) {Exec_as_str("location.reload(true);");} // HACK: force reload of page
public byte Html_doc_html_load_tid() {return html_doc_html_load_tid;} private byte html_doc_html_load_tid;
public void Html_doc_html_load_tid_(byte v) {html_doc_html_load_tid = v;}
public void Html_dispose() {}
- public String Html_doc_selected_get_text_or_href() {return Exec(cfg.Doc_selected_get_text_or_href());}
- public String Html_doc_selected_get_href_or_text() {return Exec(cfg.Doc_selected_get_href_or_text());}
- public String Html_doc_selected_get_src_or_empty() {return Exec(cfg.Doc_selected_get_src_or_empty());}
- public String Html_doc_selected_get_active_or_selection() {return Exec(cfg.Doc_selected_get_active_or_selection());}
- public boolean Html_doc_find(String id, String find, boolean dir_fwd, boolean case_match, boolean wrap_find, boolean highlight_matches) {throw Err_.not_implemented_();}
- public void Html_doc_body_focus() {Exec(cfg.Doc_body_focus());}
- public void Html_doc_selection_focus_toggle() {Exec(cfg.Doc_selection_focus_toggle());}
- public String Html_elem_atr_get_str (String id, String atr_key) {return Exec(cfg.Elem_atr_get(id, atr_key));}
- public boolean Html_elem_atr_get_bool (String id, String atr_key) {return Bool_.parse_(Exec(cfg.Elem_atr_get(id, atr_key)));}
- public boolean Html_elem_atr_set (String id, String atr_key, String val) {return Exec_as_bool(cfg.Elem_atr_set(id, atr_key, val));}
- public boolean Html_elem_atr_set_append(String id, String atr_key, String val) {return Exec_as_bool(cfg.Elem_atr_set_append(id, atr_key, val));}
- public boolean Html_elem_delete(String id) {return Exec_as_bool(cfg.Elem_delete(id));}
- public boolean Html_elem_replace_html(String id, String html) {return Exec_as_bool(cfg.Elem_replace_html(id, html));}
- public boolean Html_elem_append_above(String id, String html) {return Exec_as_bool(cfg.Elem_append_above(id, html));}
- public boolean Html_gallery_packed_exec() {return Exec_as_bool(cfg.Gallery_packed_exec());}
- public boolean Html_elem_focus(String id) {return Exec_as_bool(cfg.Elem_focus(id));}
- public boolean Html_elem_scroll_into_view(String id) {return Exec_as_bool(cfg.Elem_scroll_into_view(id));}
- public boolean Html_elem_img_update(String id, String src, int w, int h) {return Exec_as_bool(cfg.Elem_img_update(id, src, w, h));}
- public String Html_window_vpos() {return Exec(cfg.Window_vpos());}
- public boolean Html_window_vpos_(String v) {
- if (String_.Len_eq_0(v)) return false; // HACK: v == "" when switching between Read and Edit
- Gfui_html_cfg.Html_window_vpos_parse(v, scroll_top, node_path);
- return Exec_as_bool(cfg.Window_vpos_(scroll_top.Val(), node_path.Val()));
- } private String_obj_ref scroll_top = String_obj_ref.null_(), node_path = String_obj_ref.null_();
- public boolean Html_window_print_preview() {return Exec_as_bool(cfg.Window_print_preview());}
- public String Html_active_atr_get_str(String atr_key, String or) {return Exec(cfg.Active_atr_get_str(atr_key));}
public void Html_js_enabled_(boolean v) {}
- public void Html_js_eval_proc(String name, String... args) {
- Bry_fmtr fmtr = cfg.Js_scripts_get(name);
- Exec(fmtr.Bld_str_many(args));
- }
- public String Html_js_eval_script(String script) {return Exec(script);}
+ public String Html_js_eval_proc_as_str(String name, Object... args) {return Exec_as_str(js_wtr.Write_statement_return_func(name, args).To_str_and_clear());} // TODO: add other params
+ public boolean Html_js_eval_proc_as_bool(String name, Object... args) {return Exec_as_bool(js_wtr.Write_statement_return_func(name, args).To_str_and_clear());}
+ public String Html_js_eval_script(String script) {return Exec_as_str(script);}
public void Html_js_cbks_add(String js_func_name, GfoInvkAble invk) {}
public void Html_invk_src_(GfoEvObj v) {}
public GxwCore_base Core() {throw Err_.not_implemented_();}
@@ -72,10 +43,10 @@ public class Gxw_html_server implements Gxw_html {
public String TextVal() {throw Err_.not_implemented_();} public void TextVal_set(String v) {throw Err_.not_implemented_();}
public void EnableDoubleBuffering() {throw Err_.not_implemented_();}
private boolean Exec_as_bool(String s) {
- Exec(s);
+ Exec_as_str(s);
return true; // NOTE: js is async, so immediate return value is not possible; return true for now;
}
- private String Exec(String s) {
+ private String Exec_as_str(String s) {
if (wtr == null) return ""; // HACK: handles http_server
s = "(function () {" + s + "})();"; // NOTE: dependent on firefox addon which does 'var result = Function("with(arguments[0]){return "+cmd_text+"}")(session.window);'; DATE:2014-01-28
Xosrv_msg msg = Xosrv_msg.new_(Xosrv_cmd_types.Browser_exec, Bry_.Empty, Bry_.Empty, Bry_.Empty, Bry_.Empty, Bry_.new_u8(s));
diff --git a/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java b/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java
index 48ec54fef..d4b157d84 100644
--- a/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java
+++ b/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java
@@ -207,90 +207,93 @@ class HttpRequest implements Runnable{
this.app_root_dir = app.Fsys_mgr().Root_dir().To_http_file_str();
}
public void run(){
+ String err_line = "00";
try {
- InputStream is = socket.getInputStream();
- DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
- BufferedReader br = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
- String request = br.readLine();
- //System.out.println(request);
- String req = request.substring(4, request.length() - 9).trim();
- String wiki_domain = "home";
- String page_name = "Main_Page";
+ InputStream is = socket.getInputStream(); err_line = "01";
+ DataOutputStream dos = new DataOutputStream(socket.getOutputStream()); err_line = "02";
+ BufferedReader br = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8"))); err_line = "03";
+ String request = br.readLine(); err_line = "04";
+ //System.out.println(request); err_line = "03";
+ String req = request.substring(4, request.length() - 9).trim(); err_line = "05";
+ String wiki_domain = "home"; err_line = "06";
+ String page_name = "Main_Page"; err_line = "07";
if(!req.contains("%file%")){
if(req.equals("/")) { // no page; EX:"localhost:8080" vs "localhost:8080/en.wikipedia.org/wiki/Earth"
- String home_url = app.Http_server().Home();;
+ String home_url = app.Http_server().Home(); err_line = "08";
if (String_.Has_at_bgn(home_url, "file://")) {
- Io_url file_url = Io_url_.http_any_(home_url, Op_sys.Cur().Tid_is_wnt());
- String page_html = Io_mgr.I.LoadFilStr(file_url);
- Write_page(dos, page_html, app_root_dir, wiki_domain);
+ Io_url file_url = Io_url_.http_any_(home_url, Op_sys.Cur().Tid_is_wnt()); err_line = "09";
+ String page_html = Io_mgr.I.LoadFilStr(file_url); err_line = "10";
+ Write_page(dos, page_html, app_root_dir, wiki_domain); err_line = "11";
+ }
+ else {
+ req += app.Http_server().Home(); err_line = "12";
}
- else
- req += app.Http_server().Home();
}
- req = Http_server_wkr_.Assert_main_page(app, req);
+ req = Http_server_wkr_.Assert_main_page(app, req); err_line = "13";
}
if(req.contains("%xowa-cmd%") || req.contains("/xowa-cmd:")){
- System.out.println("Command output:");
- String cmd = "";
+ System.out.println("Command output:"); err_line = "14";
+ String cmd = ""; err_line = "15";
if (req.contains("%xowa-cmd%"))
cmd = req.substring(req.indexOf("%xowa-cmd%")+20);
else
cmd = req.substring(req.indexOf("/xowa-cmd:")+10);
- System.out.println(cmd);
- app.Http_server().Run_xowa_cmd(app, cmd);
- dos.writeBytes("Command sent, see console log for more details.");
- dos.close();
- }else
- if(req.contains("%file%")){
- String path = req.replace("/%file%/", app_root_dir);
- path = path.substring(path.indexOf(app_root_dir)+5);
- Url_encoder url_converter = Url_encoder.new_http_url_();
- path = url_converter.Decode_str(path);
+ System.out.println(cmd); err_line = "15";
+ app.Http_server().Run_xowa_cmd(app, cmd); err_line = "16";
+ dos.writeBytes("Command sent, see console log for more details."); err_line = "17";
+ dos.close(); err_line = "18";
+ }
+ else if(req.contains("%file%")){
+ String path = req.replace("/%file%/", app_root_dir); err_line = "19";
+ path = path.substring(path.indexOf(app_root_dir)+5); err_line = "20";
+ Url_encoder url_converter = Url_encoder.new_http_url_(); err_line = "21";
+ path = url_converter.Decode_str(path); err_line = "22";
if(path.contains("?")){
- path = path.substring(0, path.indexOf("?"));
+ path = path.substring(0, path.indexOf("?")); err_line = "23";
}
- FileInputStream fis = new FileInputStream(path);
+ FileInputStream fis = new FileInputStream(path); err_line = "24";
- dos.writeBytes("HTTP/1.1 200 OK: ");
- dos.writeBytes("Content-Type: " + contentType(path) + CRLF);
- dos.writeBytes(CRLF);
+ dos.writeBytes("HTTP/1.1 200 OK: "); err_line = "25";
+ dos.writeBytes("Content-Type: " + contentType(path) + CRLF); err_line = "26";
+ dos.writeBytes(CRLF); err_line = "27";
- sendBytes(fis, dos);
- fis.close();
- dos.close();
- br.close();
- socket.close();
+ sendBytes(fis, dos); err_line = "28";
+ fis.close(); err_line = "28";
+ dos.close(); err_line = "29";
+ br.close(); err_line = "30";
+ socket.close(); err_line = "31";
}else{
- String[] req_split = req.split("/");
- System.out.println("Request: " +request);
+ String[] req_split = req.split("/"); err_line = "32";
+ System.out.println("Request: " +request); err_line = "33";
if(req_split.length >= 1){
- wiki_domain = req_split[1];
+ wiki_domain = req_split[1]; err_line = "34";
}
if(req_split.length >= 4){
- page_name = req_split[3];
+ page_name = req_split[3]; err_line = "35";
for(int i = 4; i <= req_split.length-1; i++){
- page_name += "/"+req_split[i];
+ page_name += "/"+req_split[i]; err_line = "36";
}
- Url_encoder url_converter = Url_encoder.new_http_url_();
- page_name = url_converter.Decode_str(page_name);
+ Url_encoder url_converter = Url_encoder.new_http_url_(); err_line = "37";
+ page_name = url_converter.Decode_str(page_name); err_line = "38";
//page_name = app.Url_converter_url().Decode_str(page_name);
}
try{
- String page_html = app.Http_server().Parse_page_to_html(app, wiki_domain, page_name);
- Write_page(dos, page_html, app_root_dir, wiki_domain);
+ String page_html = app.Http_server().Parse_page_to_html(app, wiki_domain, page_name); err_line = "39";
+ Write_page(dos, page_html, app_root_dir, wiki_domain); err_line = "40";
}catch(Exception err) {
- dos.writeBytes("Site not found. Check address please, or see console log.\n"+err.getMessage());
- dos.close();
+ dos.writeBytes("Site not found. Check address please, or see console log.\n"+err.getMessage()); err_line = "41";
+ dos.close(); err_line = "42";
}
}
} catch (IOException e) {
e.printStackTrace();
}
catch (Exception e) {
- System.out.println("error retrieving page. Please make sure your url is of the form: http://localhost:8080/home/wiki/Main_Page");
+ String err_msg = String_.Format("error retrieving page. Please make sure your url is of the form: http://localhost:8080/home/wiki/Main_Page; err_msg={0} err_line={1}", e.toString(), err_line);
+ System.out.println(err_msg);
e.printStackTrace();
}
}
@@ -311,6 +314,7 @@ class HttpRequest implements Runnable{
try{
strm.writeBytes("HTTP/1.1 200 OK: ");
strm.writeBytes("Content-Type: text/html; charset=utf-8" + CRLF);
+ strm.writeBytes("Access-Control-Allow-Origin: *" + CRLF); // No 'Access-Control-Allow-Origin' header is present on the requested resource.
strm.writeBytes(CRLF);
strm.write(page_html.getBytes(Charset.forName("UTF-8")));
strm.close();
diff --git a/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java b/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java
index 34da23303..6872a2c83 100644
--- a/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java
+++ b/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java
@@ -49,7 +49,7 @@ public class Wmf_latest_parser {
byte[] date_bry = Bry_.Mid(src, date_bgn, date_end);
DateAdp date = DateAdp_.parse_fmt(String_.new_a7(Replace_or(tmp_bfr, date_trie, date_bry, 3, date_or)), "dd-MM-yyyy HH:mm");
int size_bgn = Bry_finder.Find_fwd_while_space_or_tab(src, date_end, src_len); if (size_bgn == Bry_finder.Not_found) {Gfo_usr_dlg_.I.Warn_many("", "", "size_bgn not found"); break;}
- size_end = Bry_finder.Find_fwd(src, Byte_ascii.CarriageReturn, size_bgn, src_len);
+ size_end = Bry_finder.Find_fwd(src, Byte_ascii.Cr, size_bgn, src_len);
byte[] size_bry = Bry_.Mid(src, size_bgn, size_end);
long size = Long_.parse_or_(String_.new_u8(size_bry), -1);
Wmf_latest_itm itm = new Wmf_latest_itm(name, date, size);
diff --git a/400_xowa/src/gplx/xowa/specials/Xows_mgr.java b/400_xowa/src/gplx/xowa/specials/Xows_mgr.java
index 17e21584b..469bbc56c 100644
--- a/400_xowa/src/gplx/xowa/specials/Xows_mgr.java
+++ b/400_xowa/src/gplx/xowa/specials/Xows_mgr.java
@@ -19,7 +19,7 @@ package gplx.xowa.specials; import gplx.*; import gplx.xowa.*;
import gplx.xowa.users.history.*;
import gplx.xowa.specials.*;
import gplx.xowa.specials.allPages.*; import gplx.xowa.specials.search.*; import gplx.xowa.specials.nearby.*; import gplx.xowa.specials.randoms.*; import gplx.xowa.specials.statistics.*; import gplx.xowa.xtns.translates.*; import gplx.xowa.specials.movePage.*;
-import gplx.xowa.specials.xowa.system_data.*; import gplx.xowa.specials.xowa.default_tab.*; import gplx.xowa.specials.xowa.popup_history.*; import gplx.xowa.specials.xowa.file_browsers.*; import gplx.xowa.specials.xowa.bookmarks.*;
+import gplx.xowa.specials.xowa.system_data.*; import gplx.xowa.specials.xowa.default_tab.*; import gplx.xowa.specials.xowa.popup_history.*; import gplx.xowa.specials.xowa.file_browsers.*; import gplx.xowa.specials.xowa.bookmarks.*; import gplx.xowa.specials.xowa.diags.*;
import gplx.xowa.xtns.wdatas.specials.*;
import gplx.xowa.users.data.*;
public class Xows_mgr {
@@ -47,6 +47,7 @@ public class Xows_mgr {
public Popup_history_page Page_popup_history() {return page_popup_history;} private final Popup_history_page page_popup_history = new Popup_history_page();
public Xosp_fbrow_special Page_file_browser() {return page_file_browser;} private final Xosp_fbrow_special page_file_browser = new Xosp_fbrow_special();
public Xows_bmk_page Page_bmk() {return page_bmk;} private final Xows_bmk_page page_bmk = new Xows_bmk_page();
+ public Xows_diag_page Page_diag() {return page_diag;} private final Xows_diag_page page_diag = new Xows_diag_page();
public void Evt_lang_changed(Xol_lang lang) {
hash.Clear();
hash.Add_str_obj(Xows_special_meta_.Key__search , page_search);
@@ -67,6 +68,7 @@ public class Xows_mgr {
hash.Add_str_obj(Xows_special_meta_.Key__popup_history , page_popup_history);
hash.Add_str_obj(Xows_special_meta_.Key__file_browser , page_file_browser);
hash.Add_str_obj(Xows_special_meta_.Key__bookmarks , page_bmk);
+ hash.Add_str_obj(Xows_special_meta_.Key__diag , page_diag);
}
public void Special_gen(Xowe_wiki wiki, Xoae_page page, Xoa_url url, Xoa_ttl ttl) {
int slash_pos = Bry_finder.Find_fwd(ttl.Page_txt_wo_qargs(), Xoa_ttl.Subpage_spr); // check for slash
diff --git a/400_xowa/src/gplx/xowa/specials/Xows_special_meta_.java b/400_xowa/src/gplx/xowa/specials/Xows_special_meta_.java
index 6d8267a92..08a93ba8f 100644
--- a/400_xowa/src/gplx/xowa/specials/Xows_special_meta_.java
+++ b/400_xowa/src/gplx/xowa/specials/Xows_special_meta_.java
@@ -34,6 +34,7 @@ public class Xows_special_meta_ {
, Uid__nearby = 13
, Uid__page_history = 14
, Uid__bookmarks = 15
+ , Uid__diag = 16
;
public static final String
Key__all_pages = "AllPages"
@@ -51,6 +52,7 @@ public class Xows_special_meta_ {
, Key__nearby = "Nearby"
, Key__page_history = "XowaHistory"
, Key__bookmarks = "XowaBookmarks"
+ , Key__diag = "XowaDiag"
;
public static final Xows_special_meta
Itm__all_pages = new Xows_special_meta(Src__mw , Uid__all_pages , Key__all_pages)
@@ -68,5 +70,6 @@ public class Xows_special_meta_ {
, Itm__nearby = new Xows_special_meta(Src__xowa , Uid__nearby , Key__nearby)
, Itm__page_history = new Xows_special_meta(Src__xowa , Uid__page_history , Key__page_history)
, Itm__bookmarks = new Xows_special_meta(Src__xowa , Uid__bookmarks , Key__bookmarks)
+ , Itm__diag = new Xows_special_meta(Src__xowa , Uid__diag , Key__diag)
;
}
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_mgr.java b/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_mgr.java
index 78142830a..1ab95ed34 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_mgr.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_mgr.java
@@ -17,7 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.specials.search; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*;
import gplx.gfui.*; import gplx.core.threads.*; import gplx.xowa.gui.*; import gplx.xowa.gui.views.*; import gplx.xowa.wikis.data.tbls.*;
-import gplx.web.js.*;
+import gplx.core.js.*;
public class Xog_search_suggest_mgr implements GfoInvkAble {
public Xog_search_suggest_mgr(Xoa_gui_mgr gui_mgr) {
this.app = gui_mgr.App();
@@ -79,21 +79,21 @@ public class Xog_search_suggest_mgr implements GfoInvkAble {
return; // do not notify if search terms do not match
}
List_adp found = cur_cmd.Results();
- wtr.Add_str(cbk_func);
- wtr.Add_paren_bgn();
- wtr.Add_str_quote(search_bry).Add_comma();
- wtr.Add_brack_bgn();
- int len = found.Count();
- for (int i = 0; i < len; i++) {
- Xowd_page_itm p = (Xowd_page_itm)found.Get_at(i);
- Xow_ns ns = wiki.Ns_mgr().Ids_get_or_null(p.Ns_id());
- byte[] ttl = Xoa_ttl.Replace_unders(ns.Gen_ttl(p.Ttl_page_db()));
- wtr.Add_str_arg(i, ttl);
- }
- wtr.Add_brack_end();
- wtr.Add_paren_end_semic();
+ wtr.Func_init(cbk_func);
+ wtr.Prm_bry(search_bry);
+ wtr.Prm_spr();
+ wtr.Ary_init();
+ int len = found.Count();
+ for (int i = 0; i < len; i++) {
+ Xowd_page_itm p = (Xowd_page_itm)found.Get_at(i);
+ Xow_ns ns = wiki.Ns_mgr().Ids_get_or_null(p.Ns_id());
+ byte[] ttl = Xoa_ttl.Replace_unders(ns.Gen_ttl(p.Ttl_page_db()));
+ wtr.Ary_bry(ttl);
+ }
+ wtr.Ary_term();
+ wtr.Func_term();
if (log_enabled) app.Usr_dlg().Log_many("", "", "search end: word=~{0}", String_.new_u8(search_bry));
- main_win.Active_html_box().Html_js_eval_script(wtr.Xto_str_and_clear());
+ main_win.Active_html_box().Html_js_eval_script(wtr.To_str_and_clear());
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_search_async)) Search_async();
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xosrh_qry_itm.java b/400_xowa/src/gplx/xowa/specials/search/Xosrh_qry_itm.java
index 2e55c3a91..bbded5cdd 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xosrh_qry_itm.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xosrh_qry_itm.java
@@ -50,10 +50,10 @@ class Xosrh_qry_itm {
byte wiki_db_tid = wiki.Db_mgr().Tid();
if (wiki_db_tid == Xodb_mgr_sql.Tid_sql
&& wiki.Appe().Gui_mgr().Search_suggest_mgr().Auto_wildcard()) { // HACK: auto-asterisk words for sqlite; DATE:2013-09-05
- if (!Bry_.Has_at_end(search_word, new byte[] {Byte_ascii.Asterisk}))
- search_word = Bry_.Add(search_word, Byte_ascii.Asterisk);
- if (!Bry_.Has_at_bgn(search_word, new byte[] {Byte_ascii.Asterisk}))
- search_word = Bry_.Add(Byte_ascii.Asterisk, search_word);
+ if (!Bry_.Has_at_end(search_word, new byte[] {Byte_ascii.Star}))
+ search_word = Bry_.Add(search_word, Byte_ascii.Star);
+ if (!Bry_.Has_at_bgn(search_word, new byte[] {Byte_ascii.Star}))
+ search_word = Bry_.Add(Byte_ascii.Star, search_word);
}
wiki.Db_mgr().Load_mgr().Load_search(cancelable, found, search_word, results_max);
List_adp rv = List_adp_.new_();
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xosrh_scanner.java b/400_xowa/src/gplx/xowa/specials/search/Xosrh_scanner.java
index d21f3dafd..2c72e35e8 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xosrh_scanner.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xosrh_scanner.java
@@ -118,7 +118,7 @@ class Xosrh_scanner {
byte[] cur_word = Bry_.Mid(src, src_bgn, src_end);
byte[][] words = gplx.xowa.bldrs.cmds.texts.Xob_search_base.Split_ttl_into_words(null, tmp_list, tmp_bfr, cur_word);
int words_len = words.length;
- if (words_len == 1 && !Bry_.Eq(words[0], cur_word) && Bry_finder.Find_fwd(cur_word, Byte_ascii.Asterisk) == -1) {
+ if (words_len == 1 && !Bry_.Eq(words[0], cur_word) && Bry_finder.Find_fwd(cur_word, Byte_ascii.Star) == -1) {
tkns.Add(Xosrh_qry_tkn.new_bry_(tid, words[0]));
return;
}
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher.java b/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher.java
index d1f1ce994..4c5d8a4ff 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher.java
@@ -21,7 +21,7 @@ public class Xows_db_matcher {
private final Gfo_pattern raw_pattern;
public Xows_db_matcher(int tid, byte[] raw, Xows_db_matcher lhs, Xows_db_matcher rhs) {
this.tid = tid; this.raw = raw; this.lhs = lhs; this.rhs = rhs;
- this.raw_pattern = Bry_.Has(raw, Byte_ascii.Asterisk) ? new Gfo_pattern(raw) : null;
+ this.raw_pattern = Bry_.Has(raw, Byte_ascii.Star) ? new Gfo_pattern(raw) : null;
}
public int Tid() {return tid;} private final int tid;
public int Page_count() {return page_count;} public void Page_count_(int v) {page_count = v;} private int page_count;
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher_bldr.java b/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher_bldr.java
index 9336adbca..7c176d41c 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher_bldr.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xows_db_matcher_bldr.java
@@ -28,7 +28,7 @@ class Xows_db_matcher_bldr {
switch (matcher.Tid()) {
case Xows_db_matcher.Tid_word:
byte[] word_text = matcher.Raw();
- if (Bry_.Has(word_text, Byte_ascii.Asterisk))
+ if (Bry_.Has(word_text, Byte_ascii.Star))
Load_word_many(cxl, rv, word_text, word_tbl);
else
Load_word_one(rv, word_text, word_tbl);
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java b/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java
index 71024db45..b2c2eefb1 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java
@@ -47,7 +47,7 @@ public class Xows_ns_mgr {
int ns_enabled = Bry_.Xto_int(val);
if (ns_enabled == 1) { // make sure set to 1; EX: ignore &ns0=0
int key_len = key.length;
- if (key_len == 3 && key[2] == Byte_ascii.Asterisk) // translate ns* as ns_all
+ if (key_len == 3 && key[2] == Byte_ascii.Star) // translate ns* as ns_all
ns_all = true;
else {
int ns_id = Bry_.Xto_int_or(key, 2, key_len, Int_.MinValue);
@@ -77,5 +77,5 @@ public class Xows_ns_mgr {
return tmp_bfr.Xto_bry_and_clear();
}
}
- private static final byte[] Hash_key_all = new byte[] {Byte_ascii.Asterisk}, Hash_key_main = new byte[] {Byte_ascii.Num_0};
+ private static final byte[] Hash_key_all = new byte[] {Byte_ascii.Star}, Hash_key_main = new byte[] {Byte_ascii.Num_0};
}
diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java b/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java
index 5b943edad..1b270decd 100644
--- a/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java
+++ b/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java
@@ -61,9 +61,9 @@ public class Xows_page__search implements Xows_page, GfoInvkAble, GfoEvObj {
}
if ( search_suggest_mgr.Auto_wildcard() // add * automatically if option set
&& wiki.Db_mgr().Tid() == gplx.xowa.dbs.Xodb_mgr_sql.Tid_sql // only apply to sql
- && Bry_finder.Find_fwd(search_bry, Byte_ascii.Asterisk) == -1 // search term does not have asterisk
+ && Bry_finder.Find_fwd(search_bry, Byte_ascii.Star) == -1 // search term does not have asterisk
)
- search_bry = Bry_.Add(search_bry, Byte_ascii.Asterisk);
+ search_bry = Bry_.Add(search_bry, Byte_ascii.Star);
url.Page_bry_(Bry_.Add(Xows_special_meta_.Itm__search.Ttl_bry(), Byte_ascii.Slash_bry, search_bry));// HACK: need to re-set Page b/c href_parser does not eliminate qargs; DATE:2013-02-08
// search wiki
Xoa_ttl search_ttl = Xoa_ttl.parse_(wiki, search_bry);
diff --git a/400_xowa/src/gplx/xowa/specials/search/parsers/Xows_text_parser__v1.java b/400_xowa/src/gplx/xowa/specials/search/parsers/Xows_text_parser__v1.java
index a4020f7bc..4336ff22d 100644
--- a/400_xowa/src/gplx/xowa/specials/search/parsers/Xows_text_parser__v1.java
+++ b/400_xowa/src/gplx/xowa/specials/search/parsers/Xows_text_parser__v1.java
@@ -40,12 +40,12 @@ class Xows_text_parser__v1 {
switch (b) {
case Byte_ascii.Underline: // underline is word-breaking; EX: A_B -> A, B
case Byte_ascii.Space: // should not occur, but just in case (only underscores)
- case Byte_ascii.Tab: case Byte_ascii.NewLine: case Byte_ascii.CarriageReturn: // should not occur in titles, but just in case
+ case Byte_ascii.Tab: case Byte_ascii.Nl: case Byte_ascii.Cr: // should not occur in titles, but just in case
case Byte_ascii.Dash: // treat hypenated words separately
case Byte_ascii.Dot: // treat abbreviations as separate words; EX: A.B.C.
case Byte_ascii.Bang: case Byte_ascii.Hash: case Byte_ascii.Dollar: case Byte_ascii.Percent:
- case Byte_ascii.Amp: case Byte_ascii.Paren_bgn: case Byte_ascii.Paren_end: case Byte_ascii.Asterisk:
+ case Byte_ascii.Amp: case Byte_ascii.Paren_bgn: case Byte_ascii.Paren_end: case Byte_ascii.Star:
case Byte_ascii.Comma: case Byte_ascii.Slash:
case Byte_ascii.Colon: case Byte_ascii.Semic: case Byte_ascii.Gt:
case Byte_ascii.Question: case Byte_ascii.At: case Byte_ascii.Brack_bgn: case Byte_ascii.Brack_end:
diff --git a/400_xowa/src/gplx/xowa/specials/search/parsers_old/Xow_search_scanner.java b/400_xowa/src/gplx/xowa/specials/search/parsers_old/Xow_search_scanner.java
index 1529c8d4f..92bf7e295 100644
--- a/400_xowa/src/gplx/xowa/specials/search/parsers_old/Xow_search_scanner.java
+++ b/400_xowa/src/gplx/xowa/specials/search/parsers_old/Xow_search_scanner.java
@@ -121,7 +121,7 @@ class Xow_search_scanner {
int words_len = words.length;
if ( words_len == 1 // only one word
&& !Bry_.Eq(words[0], cur_word) // split word not same as raw
- && Bry_finder.Find_fwd(cur_word, Byte_ascii.Asterisk) == -1 // no asterisk
+ && Bry_finder.Find_fwd(cur_word, Byte_ascii.Star) == -1 // no asterisk
) {
tkns.Add(Xow_search_tkn.new_bry(tid, words[0]));
return;
diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java
new file mode 100644
index 000000000..98518c041
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java
@@ -0,0 +1,73 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*;
+import gplx.dbs.*;
+import gplx.dbs.engines.mems.*;
+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) {
+ Mem_qry_set qry_set = new Mem_qry_set();
+ DataRdr rdr = conn.Exec_sql_as_rdr(sql);
+ try {
+ int fld_count = rdr.FieldCount();
+ while (rdr.MoveNextPeer()) {
+ Mem_row row = new Mem_row();
+ for (int i = 0; i < fld_count; ++i)
+ row.Add(fld_list.Get_at(i).Name(), rdr.ReadAt(i));
+ qry_set.Add(row);
+ }
+ }
+ finally {
+ rdr.Rls();
+ }
+ return qry_set;
+ }
+ public static Object[][] Load(Db_conn conn, String sql) {
+ List_adp list = List_adp_.new_();
+ DataRdr rdr = conn.Exec_sql_as_rdr(sql);
+ try {
+ int fld_count = rdr.FieldCount();
+ while (rdr.MoveNextPeer()) {
+ Object[] row = new Object[fld_count];
+ for (int i = 0; i < fld_count; ++i) {
+ row[i] = rdr.ReadAt(i);
+ }
+ list.Add(row);
+ }
+ }
+ finally {
+ rdr.Rls();
+ }
+ return (Object[][])list.To_ary_and_clear(Object[].class);
+ }
+ public static void Write_to_bfr(Bry_bfr bfr, Object[][] rows, int... skip) {
+ int rows_len = rows.length;
+ for (int i = 0; i < rows_len; ++i) {
+ Object[] row = (Object[])rows[i];
+ int row_len = row.length;
+ for (int j = 0; j < row_len; ++j) {
+ if (skip != null && Int_.In(j, skip)) continue;
+ Object val = row[j];
+ bfr.Add_obj(val).Add_byte_pipe();
+ }
+ bfr.Add_byte_nl();
+ }
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java
new file mode 100644
index 000000000..cebc46add
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java
@@ -0,0 +1,137 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*;
+import gplx.fsdb.*; import gplx.fsdb.meta.*;
+import gplx.xowa.files.origs.*;
+class Xows_cmd__file_check {
+ private Io_url tmp_dir;
+ public void Exec(Bry_bfr bfr, Xoa_app app, Xoa_url url, Xoa_url_arg_hash 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);
+ tmp_dir = wiki.Fsys_mgr().Tmp_dir();
+ boolean schema_1 = wiki.File__fsdb_core().File__schema_is_1();
+ Fsdb_db_file atr_main = null;
+ try {Write_kv(bfr, "machine.op_sys", Op_sys.Cur().Os_name());} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {Write_kv(bfr, "app.version", Xoa_app_.Version);} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {Write_kv(bfr, "cfg_file_retrieve", ((Xoae_app)app).File_mgr().Wmf_mgr().Enabled());} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {Write_kv(bfr, "fsdb.schema_is_1", schema_1);} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {Write_kv(bfr, "fsdb.mnt_file", wiki.File__fsdb_core().File__mnt_file().Url());} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {Write_kv(bfr, "fsdb.abc_file", wiki.File__fsdb_core().File__abc_file__at(Fsm_mnt_mgr.Mnt_idx_main).Url());} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {
+ atr_main = wiki.File__fsdb_core().File__atr_file__at(Fsm_mnt_mgr.Mnt_idx_main);
+ Write_kv(bfr, "fsdb.atr_file", atr_main.Url());
+ } catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ try {Write_kv(bfr, "fsdb.orig", wiki.File__fsdb_core().File__orig_tbl_ary()[0].Conn().Conn_info().Xto_raw());} catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ Fsdb_sql_mkr sql_mkr = schema_1 ? Fsdb_sql_mkr__v1.I : Fsdb_sql_mkr__v2.I;
+ String sql = "";
+ try {
+ Xof_orig_tbl orig_tbl = wiki.File__fsdb_core().File__orig_tbl_ary()[0];
+ sql = sql_mkr.Orig_by_ttl(file_bry);
+ Write_sect(bfr, "fsdb.orig.select", sql);
+ Db_rdr_utl.Load_and_write(orig_tbl.Conn(), sql, bfr);
+ } catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ Object[][] rows = null;
+ try {
+ sql = sql_mkr.Fil_by_ttl(file_bry);
+ Write_sect(bfr, "fsdb.fil.select", sql);
+ rows = Db_rdr_utl.Load(atr_main.Conn(), sql);
+ Db_rdr_utl.Write_to_bfr(bfr, rows);
+ Write_thms(bfr, file_bry, sql_mkr, wiki.File__mnt_mgr().Mnts__get_main(), atr_main, rows);
+ } catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ }
+ private void Write_thms(Bry_bfr bfr, byte[] file_bry, Fsdb_sql_mkr sql_mkr, Fsm_mnt_itm mnt_itm, Fsdb_db_file atr_main, Object[][] rows) {
+ int rows_len = rows.length;
+ for (int i = 0; i < rows_len; ++i) {
+ Object[] row = rows[i];
+ int file_id = Int_.cast_(row[0]);
+ String sql = sql_mkr.Thm_by_id(file_id);
+ Write_sect(bfr, "fsdb.thm.select", sql);
+ Object[][] thm_rows = Db_rdr_utl.Load(atr_main.Conn(), sql);
+ Db_rdr_utl.Write_to_bfr(bfr, thm_rows);
+ Write_bins(bfr, file_bry, sql_mkr, mnt_itm, thm_rows, 0, 6);
+ Object bin_db_id_obj = row[4];
+ if (bin_db_id_obj != null) {
+ Write_bins(bfr, file_bry, sql_mkr, mnt_itm, rows, 0, 4);
+ }
+ }
+ }
+ private void Write_bins(Bry_bfr bfr, byte[] file_bry, Fsdb_sql_mkr sql_mkr, Fsm_mnt_itm mnt_itm, Object[][] rows, int owner_id_ordinal, int bin_db_id_ordinal) {
+ int rows_len = rows.length;
+ for (int i = 0; i < rows_len; ++i) {
+ Object[] row = rows[i];
+ int bin_db_id = Int_.cast_(row[bin_db_id_ordinal]); if (bin_db_id == -1) continue;
+ Fsm_bin_fil bin_db = mnt_itm.Bin_mgr().Dbs__get_at(bin_db_id);
+ int owner_id = Int_.cast_(row[owner_id_ordinal]);
+ String sql = sql_mkr.Bin_by_id(owner_id);
+ Write_sect(bfr, "fsdb.bin.select", sql);
+ Object[][] bin_rows = Db_rdr_utl.Load(bin_db.Conn(), sql);
+ Db_rdr_utl.Write_to_bfr(bfr, bin_rows, 4);
+ Export_bins(bfr, file_bry, bin_rows, 0, 4);
+ }
+ }
+ private void Export_bins(Bry_bfr bfr, byte[] file_bry, Object[][] rows, int owner_id_ordinal, int bin_data_ordinal) {
+ int rows_len = rows.length;
+ Bry_bfr tmp_bfr = Bry_bfr.new_();
+ for (int i = 0; i < rows_len; ++i) {
+ Object[] row = rows[i];
+ int owner_id = Int_.cast_(row[owner_id_ordinal]);
+ byte[] bin_data = (byte[])row[bin_data_ordinal];
+ file_bry = gplx.xowa.files.repos.Xof_repo_itm_.Ttl_invalid_fsys_chars(tmp_bfr, file_bry);
+ Io_url bin_url = tmp_dir.GenSubFil(String_.new_u8(file_bry));
+ bin_url = tmp_dir.GenSubFil(bin_url.NameOnly() + "_" + Int_.Xto_str(owner_id) + bin_url.Ext());
+ Write_kv(bfr, "fsdb.bin.export", bin_url.Raw());
+ Write_kv(bfr, "fsdb.bin.len", bin_data.length);
+ Io_mgr.I.SaveFilBry(bin_url, bin_data);
+ }
+ }
+ private static void Write_kv(Bry_bfr bfr, String key, Object val) {
+ bfr.Add_str_u8(key);
+ bfr.Add_str_a7(" = ");
+ bfr.Add_obj(val);
+ bfr.Add_byte_nl();
+ }
+ private static void Write_sect(Bry_bfr bfr, String key, Object val) {
+ bfr.Add_byte_nl();
+ bfr.Add_str_u8("------------------------------------------------------").Add_byte_nl();
+ bfr.Add_str_u8(key).Add_str_a7(": ").Add_obj(val).Add_byte_nl();
+ bfr.Add_str_u8("------------------------------------------------------").Add_byte_nl();
+ }
+ private static final byte[] Arg_wiki = Bry_.new_a7("wiki"), Arg_file = Bry_.new_a7("file");
+ public static final Xows_cmd__file_check I = new Xows_cmd__file_check(); Xows_cmd__file_check() {}
+}
+interface Fsdb_sql_mkr {
+ String Orig_by_ttl(byte[] ttl);
+ String Fil_by_ttl(byte[] ttl);
+ String Thm_by_id(int id);
+ String Bin_by_id(int id);
+}
+abstract class Fsdb_sql_mkr__base {
+ public String Fil_by_ttl(byte[] ttl) {return String_.Format("SELECT * FROM fsdb_fil WHERE fil_name = '{0}';", ttl);}
+ public String Bin_by_id(int id) {return String_.Format("SELECT * FROM fsdb_bin WHERE bin_owner_id = {0};", id);}
+}
+class Fsdb_sql_mkr__v1 extends Fsdb_sql_mkr__base implements Fsdb_sql_mkr {
+ public String Orig_by_ttl(byte[] ttl) {return String_.Format("SELECT * FROM wiki_orig WHERE orig_ttl = '{0}';", ttl);}
+ public String Thm_by_id(int id) {return String_.Format("SELECT * FROM fsdb_xtn_thm WHERE thm_owner_id = {0};", id);}
+ public static final Fsdb_sql_mkr I = new Fsdb_sql_mkr__v1(); Fsdb_sql_mkr__v1() {}
+}
+class Fsdb_sql_mkr__v2 extends Fsdb_sql_mkr__base implements Fsdb_sql_mkr {
+ public String Orig_by_ttl(byte[] ttl) {return String_.Format("SELECT * FROM orig_reg WHERE orig_ttl = '{0}';", ttl);}
+ public String Thm_by_id(int id) {return String_.Format("SELECT * FROM fsdb_thm WHERE thm_owner_id = {0};", id);}
+ public static final Fsdb_sql_mkr I = new Fsdb_sql_mkr__v2(); Fsdb_sql_mkr__v2() {}
+}
diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java
new file mode 100644
index 000000000..ba0ca6788
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java
@@ -0,0 +1,59 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*;
+import gplx.ios.*;
+import gplx.fsdb.meta.*;
+class Xows_cmd__fs_check {
+ public void Exec(Bry_bfr bfr, Xoa_app app, Xoa_url url, Xoa_url_arg_hash arg_hash) {
+ byte[] dir_bry = arg_hash.Get_val_bry_or(Arg_dir, null);
+ if (dir_bry != null) {
+ Write_dir(bfr, Io_url_.new_dir_(String_.new_u8(dir_bry)));
+ 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);
+ Io_url wiki_dir = wiki.Fsys_mgr().Root_dir();
+ Io_url file_dir = wiki.Fsys_mgr().File_dir();
+ Write_dir(bfr, wiki_dir);
+ Write_dir(bfr, file_dir);
+ Write_dir(bfr, file_dir.GenSubDir(Fsm_mnt_tbl.Mnt_name_main));
+ Write_dir(bfr, file_dir.GenSubDir(Fsm_mnt_tbl.Mnt_name_user));
+ Write_dir(bfr, file_dir.GenSubDir("fsdb.update_00"));
+ }
+ private void Write_dir(Bry_bfr bfr, Io_url dir_url) {
+ bfr.Add_byte_nl().Add_str_a7("scanning: ").Add_str_u8(dir_url.Raw()).Add_byte_nl();
+ if (!Io_mgr.I.ExistsDir(dir_url)) return;
+ IoItmDir dir_itm = Io_mgr.I.QueryDir_args(dir_url).Recur_(false).DirInclude_(true).ExecAsDir();
+ IoItmList sub_itms = dir_itm.SubDirs(); int len = sub_itms.Count();
+ for (int i = 0; i < len; ++i) {
+ try {
+ IoItmDir sub_itm = (IoItmDir)sub_itms.Get_at(i);
+ bfr.Add_str_a7("dir").Add_byte_pipe().Add_str_u8(sub_itm.Name()).Add_byte_nl();
+ } catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ }
+ sub_itms = dir_itm.SubFils(); len = sub_itms.Count();
+ for (int i = 0; i < len; ++i) {
+ try {
+ IoItmFil sub_itm = (IoItmFil)sub_itms.Get_at(i);
+ bfr.Add_str_a7("fil").Add_byte_pipe().Add_str_u8(sub_itm.Name()).Add_byte_pipe().Add_long_variable(sub_itm.Size()).Add_byte_pipe().Add_dte(sub_itm.ModifiedTime()).Add_byte_nl();
+ } catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx(e));}
+ }
+ }
+ public static final Xows_cmd__fs_check I = new Xows_cmd__fs_check(); Xows_cmd__fs_check() {}
+ private static final byte[] Arg_wiki = Bry_.new_a7("wiki"), Arg_dir = Bry_.new_a7("dir");
+}
diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__sql_dump.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__sql_dump.java
new file mode 100644
index 000000000..8b6de59b8
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__sql_dump.java
@@ -0,0 +1,51 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*;
+import gplx.ios.*; import gplx.core.primitives.*;
+import gplx.dbs.*;
+import gplx.fsdb.meta.*;
+class Xows_cmd__sql_dump {
+ public void Exec(Bry_bfr bfr, Xoa_app app, Xoa_url url, Xoa_url_arg_hash arg_hash) {
+ Db_conn conn = null;
+ byte[] sql_bry = arg_hash.Get_val_bry_or(Arg_sql, null); if (sql_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no sql: url=~{0}", url.Raw()); return;}
+ byte[] wiki_bry = arg_hash.Get_val_bry_or(Arg_wiki, null);
+ if (wiki_bry == null) {
+ byte[] db_file_bry = arg_hash.Get_val_bry_or(Arg_db_file, null); if (db_file_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no db_type: url=~{0}", url.Raw()); return;}
+ conn = Db_conn_bldr.I.Get(Io_url_.new_fil_(String_.new_u8(db_file_bry)));
+ }
+ 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);
+ 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;
+ case Db_type_fsdb_abc: conn = wiki.File__fsdb_core().File__abc_file__at(Fsm_mnt_mgr.Mnt_idx_main).Conn(); break;
+ case Db_type_fsdb_atr: conn = wiki.File__fsdb_core().File__atr_file__at(Fsm_mnt_mgr.Mnt_idx_main).Conn(); break;
+ }
+ }
+ Db_rdr_utl.Load_and_write(conn, String_.new_u8(sql_bry), bfr);
+ }
+ public static final Xows_cmd__sql_dump I = new Xows_cmd__sql_dump(); Xows_cmd__sql_dump() {}
+ private static final byte[] Arg_wiki = Bry_.new_a7("wiki"), Arg_db_file = Bry_.new_a7("db_file"), Arg_db_type = Bry_.new_a7("db_type"), Arg_sql = Bry_.new_a7("sql");
+ private static final byte Db_type_fsdb_abc = 1, Db_type_fsdb_atr = 2, Db_type_wiki_core = 3;
+ private static final Hash_adp_bry db_type_hash = Hash_adp_bry.cs_()
+ .Add_str_byte("fsdb.abc" , Db_type_fsdb_abc)
+ .Add_str_byte("fsdb.atr" , Db_type_fsdb_atr)
+ .Add_str_byte("wiki.core" , Db_type_wiki_core)
+ ;
+}
diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_diag_page.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_diag_page.java
new file mode 100644
index 000000000..d22b227fa
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_diag_page.java
@@ -0,0 +1,44 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*;
+import gplx.core.primitives.*;
+public class Xows_diag_page implements Xows_page {
+ private Xoa_url_arg_hash arg_hash = new Xoa_url_arg_hash();
+ public Xows_special_meta Special_meta() {return Xows_special_meta_.Itm__diag;}
+ public void Special_gen(Xowe_wiki wiki, Xoae_page page, Xoa_url url, Xoa_ttl ttl) {
+ arg_hash.Load(url);
+ byte[] cmd_type_bry = arg_hash.Get_val_bry_or(Arg_type, null); if (cmd_type_bry == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; no type: url=~{0}", url.Raw()); return;}
+ Byte_obj_val cmd_type_val = (Byte_obj_val)type_hash.Get_by_bry(cmd_type_bry); if (cmd_type_val == null) {Xoa_app_.Usr_dlg().Warn_many("", "", "special.cmd; bad type: url=~{0}", url.Raw()); return;}
+ Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_m001();
+ bfr.Add_str_a7("\n");
+ switch (cmd_type_val.Val()) {
+ case Type_file_check: Xows_cmd__file_check.I.Exec(bfr, wiki.App(), url, arg_hash); break;
+ case Type_fs_check: Xows_cmd__fs_check.I.Exec(bfr, wiki.App(), url, arg_hash); break;
+ case Type_sql_dump: Xows_cmd__sql_dump.I.Exec(bfr, wiki.App(), url, arg_hash); break;
+ }
+ bfr.Add_str_a7("\n");
+ page.Data_raw_(bfr.Xto_bry_and_clear());
+ }
+ private static final byte[] Arg_type = Bry_.new_a7("type");
+ private static final byte Type_file_check = 1, Type_fs_check = 2, Type_sql_dump = 3;
+ private static final Hash_adp_bry type_hash = Hash_adp_bry.cs_()
+ .Add_str_byte("file.check" , Type_file_check)
+ .Add_str_byte("fs.check" , Type_fs_check)
+ .Add_str_byte("sql.dump" , Type_sql_dump)
+ ;
+}
diff --git a/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java b/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java
index 22b4b757d..5ad756425 100644
--- a/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java
+++ b/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java
@@ -29,7 +29,7 @@ public class Popup_history_page implements Xows_page {
if (Ttl_chk(itm.Page_ttl())) continue;
fmtr_main.Bld_bfr_many(bfr, itm.Page_href(), itm.Page_ttl().Full_txt());
}
- page.Data_raw_(bfr.Trim_end(Byte_ascii.NewLine).To_bry_and_rls());
+ page.Data_raw_(bfr.Trim_end(Byte_ascii.Nl).To_bry_and_rls());
page.Html_data().Html_restricted_n_();
}
private Bry_fmtr fmtr_main = Bry_fmtr.new_("~{ttl}\n\n", "href", "ttl"); // NOTE: need to use anchor (as opposed to lnki or lnke) b/c xwiki will not work on all wikis
diff --git a/400_xowa/src/gplx/xowa/tdbs/Xotdb_page_raw_parser.java b/400_xowa/src/gplx/xowa/tdbs/Xotdb_page_raw_parser.java
index 21794172a..e83469588 100644
--- a/400_xowa/src/gplx/xowa/tdbs/Xotdb_page_raw_parser.java
+++ b/400_xowa/src/gplx/xowa/tdbs/Xotdb_page_raw_parser.java
@@ -34,7 +34,7 @@ public class Xotdb_page_raw_parser {
} Io_line_rdr rdr; Xowe_wiki wiki; Xow_ns_mgr ns_mgr; Xow_ns ns_itm;
public void Skip_first_line() {
rdr.Read_next();
- int pos = Bry_finder.Find_fwd(rdr.Bfr(), Byte_ascii.NewLine);
+ int pos = Bry_finder.Find_fwd(rdr.Bfr(), Byte_ascii.Nl);
// rdr.Move(pos + 1);
rdr.Truncate(pos + 1);
}
diff --git a/400_xowa/src/gplx/xowa/users/Xoue_user.java b/400_xowa/src/gplx/xowa/users/Xoue_user.java
index 36341eb92..b8b90a304 100644
--- a/400_xowa/src/gplx/xowa/users/Xoue_user.java
+++ b/400_xowa/src/gplx/xowa/users/Xoue_user.java
@@ -120,7 +120,7 @@ public class Xoue_user implements Xou_user, GfoEvMgrOwner, GfoInvkAble {
}
}
private void Available_from_bulk(byte[] raw) {
- byte[][] wikis = Bry_.Split(raw, Byte_ascii.NewLine);
+ byte[][] wikis = Bry_.Split(raw, Byte_ascii.Nl);
Xowe_wiki usr_wiki = Wiki();
int wikis_len = wikis.length;
for (int i = 0; i < wikis_len; i++)
diff --git a/400_xowa/src/gplx/xowa/users/Xouv_user.java b/400_xowa/src/gplx/xowa/users/Xouv_user.java
index 13c07074f..561b9b41d 100644
--- a/400_xowa/src/gplx/xowa/users/Xouv_user.java
+++ b/400_xowa/src/gplx/xowa/users/Xouv_user.java
@@ -25,7 +25,7 @@ public class Xouv_user implements Xou_user {
public Xouv_user(String key) {this.key = key;}
public String Key() {return key;} private String key;
public Xou_db_mgr User_db_mgr() {return user_db_mgr;} private Xou_db_mgr user_db_mgr;
- public Xow_wiki Wikii() {if (wiki == null) wiki = wiki_mgr.Get_by_key_or_make_2(Xow_domain_.Domain_bry_home); return wiki;} private Xow_wiki wiki;
+ public Xow_wiki Wikii() {if (wiki == null) wiki = wiki_mgr.Get_by_key_or_make_init_y(Xow_domain_.Domain_bry_home); return wiki;} private Xow_wiki wiki;
public void Init_db(Xoa_app app, Xoa_wiki_mgr wiki_mgr, Io_url db_url) {
this.wiki_mgr = wiki_mgr;
this.user_db_mgr = new Xou_db_mgr(app);
diff --git a/400_xowa/src/gplx/xowa/users/data/Html_grid_wtr.java b/400_xowa/src/gplx/xowa/users/data/Html_grid_wtr.java
new file mode 100644
index 000000000..a9d564316
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/users/data/Html_grid_wtr.java
@@ -0,0 +1,143 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*;
+class Hgrid_tbl_data {
+ public Hgrid_tbl_data(Hgrid_col_data[] cols, Hgrid_row_data[] rows) {this.cols = cols; this.rows = rows;}
+ public Hgrid_col_data[] Cols() {return cols;} private final Hgrid_col_data[] cols;
+ public Hgrid_row_data[] Rows() {return rows;} private final Hgrid_row_data[] rows;
+}
+class Hgrid_col_data {
+ public Hgrid_col_data(int type, String key, String display) {this.type = type; this.key = key; this.display = display;}
+ public int Type() {return type;} private final int type;
+ public String Key() {return key;} private final String key;
+ public String Display() {return display;} private final String display;
+ public static final int Type_id_str = 1;
+}
+class Hgrid_row_data {
+ public Hgrid_row_data(Hgrid_tbl_data tbl, String pkey, Hgrid_cell_data[] cells, Hgrid_btn_data[] btns) {this.tbl = tbl; this.pkey = pkey; this.cells = cells; this.btns = btns;}
+ public Hgrid_tbl_data Tbl() {return tbl;} private final Hgrid_tbl_data tbl;
+ public String Pkey() {return pkey;} private final String pkey;
+ public Hgrid_cell_data[] Cells() {return cells;} private Hgrid_cell_data[] cells;
+ public Hgrid_btn_data[] Btns() {return btns;} private Hgrid_btn_data[] btns;
+}
+class Hgrid_cell_data {
+ public Hgrid_cell_data(String data, String html) {this.data = data; this.html = html;}
+ public String Data() {return data;} private final String data;
+ public String Html() {return html;} private final String html;
+}
+class Hgrid_btn_data {
+ public Hgrid_btn_data(String cmd, String img, String text) {this.cmd = cmd; this.img = img; this.text = text;}
+ public String Cmd() {return cmd;} private final String cmd;
+ public String Img() {return img;} private final String img;
+ public String Text() {return text;} private final String text;
+}
+class Hgrid_tbl_fmtr {
+ private final Hgrid_head_row_fmtr head_row_fmtr = new Hgrid_head_row_fmtr();
+ private final Hgrid_data_rows_fmtr data_rows_fmtr = new Hgrid_data_rows_fmtr();
+ public void Write(Bry_bfr bfr, Hgrid_tbl_data data) {
+ tbl_fmtr.Bld_bry_many(bfr, head_row_fmtr.Init(data), data_rows_fmtr.Init(data));
+ }
+ private static final Bry_fmtr tbl_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( ""
+ , " ~{head_cells}"
+ , "
~{data_rows}"
+ , "
"
+ ), "head_cells", "data_rows");
+}
+class Hgrid_head_row_fmtr implements Bry_fmtr_arg {
+ private Hgrid_tbl_data data;
+ public Hgrid_head_row_fmtr Init(Hgrid_tbl_data data) {this.data = data; return this;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ Hgrid_col_data[] cols = data.Cols(); int len = cols.length;
+ for (int i = 0; i < len; ++i) {
+ Hgrid_col_data col = cols[i];
+ fmtr.Bld_bfr_many(bfr, col.Display());
+ }
+ }
+ private static final Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( " ~{display} | "
+ ), "display");
+}
+class Hgrid_data_rows_fmtr implements Bry_fmtr_arg {
+ private final Hgrid_data_cell_fmtr cells_fmtr = new Hgrid_data_cell_fmtr();
+ private Hgrid_tbl_data data;
+ public Hgrid_data_rows_fmtr Init(Hgrid_tbl_data data) {this.data = data; return this;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ Hgrid_row_data[] rows = data.Rows(); int len = rows.length;
+ for (int i = 0; i < len; ++i) {
+ Hgrid_row_data row = rows[i];
+ fmtr.Bld_bfr_many(bfr, i, row.Pkey(), cells_fmtr.Init(i, row));
+ }
+ }
+ private static final Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( " ~{cells}~{cmds}"
+ , "
"
+ ), "id", "pkey", "cells");
+}
+class Hgrid_data_cell_fmtr implements Bry_fmtr_arg {
+ private int row_idx; private Hgrid_row_data data;
+ public Hgrid_data_cell_fmtr Init(int row_idx, Hgrid_row_data data) {this.row_idx = row_idx; this.data = data; return this;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ Hgrid_cell_data[] cells = data.Cells(); int len = cells.length;
+ Hgrid_col_data[] cols = data.Tbl().Cols();
+ for (int i = 0; i < len; ++i) {
+ Hgrid_cell_data cell = cells[i];
+ fmtr.Bld_bfr_many(bfr, row_idx, cols[i].Key(), i, cell.Data(), cell.Html());
+ }
+ }
+ private static final Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( " ~{html} | "
+ ), "row", "col", "idx", "data", "html");
+}
+class Hgrid_row_btns_fmtr implements Bry_fmtr_arg {
+ private int row_idx; private Hgrid_row_data data;
+ public Hgrid_row_btns_fmtr Init(int row_idx, Hgrid_row_data data) {this.row_idx = row_idx; this.data = data; return this;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ Hgrid_btn_data[] btns = data.Btns(); int len = btns.length;
+ for (int i = 0; i < len; ++i) {
+ Hgrid_btn_data btn = btns[i];
+ fmtr.Bld_bfr_many(bfr, row_idx, btn.Cmd(), btn.Img(), btn.Text());
+ }
+ }
+ private static final Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( " 
"
+ ), "row", "cmd", "img", "text");
+}
+/*
+
+*/
diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_bmk_tbl.java b/400_xowa/src/gplx/xowa/users/data/Xoud_bmk_tbl.java
index b3e50f008..088b2441a 100644
--- a/400_xowa/src/gplx/xowa/users/data/Xoud_bmk_tbl.java
+++ b/400_xowa/src/gplx/xowa/users/data/Xoud_bmk_tbl.java
@@ -40,7 +40,7 @@ public class Xoud_bmk_tbl implements RlsAble {
}
public Xoud_bmk_row[] Select_all() {
List_adp list = List_adp_.new_();
- Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Db_meta_fld.Ary_empy).Clear().Exec_select__rls_auto();
+ Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Db_meta_fld.Ary_empty).Clear().Exec_select__rls_auto();
try {
while (rdr.Move_next())
list.Add(new_row(rdr));
diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java b/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java
index e51afddee..8760516a5 100644
--- a/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java
+++ b/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java
@@ -48,7 +48,7 @@ class Xoud_opt_scope_parser {
public Xoud_opt_scope Parse_itm(byte[] src, int bgn, int end) {
int lang_dot = Bry_finder.Find_fwd(src, Byte_ascii.Dot, bgn, end); if (lang_dot == Bry_finder.Not_found) return Warn("scope.parse.missing_lang_dot: src=~{0}", src, bgn, end);
int lang_id = Int_.MinValue;
- if (lang_dot == 1 && src[bgn] == Byte_ascii.Asterisk)
+ if (lang_dot == 1 && src[bgn] == Byte_ascii.Star)
lang_id = Xoud_opt_scope.Lang_id_wildcard;
else {
Xol_lang_itm lang_itm = Xol_lang_itm_.Get_by_key_or_null(src, bgn, lang_dot); if (lang_itm == null) return Warn("scope.parse.invalid_lang: src=~{0}", src, bgn, end);
diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java b/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java
index f7047928b..98dbad26b 100644
--- a/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java
+++ b/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java
@@ -58,7 +58,7 @@ class Xoud_user_tbl {
}
public int Select_id_next() {
int rv = 1;
- Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Db_meta_fld.Ary_empy).Exec_select__rls_auto();
+ Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Db_meta_fld.Ary_empty).Exec_select__rls_auto();
try {
while (rdr.Move_next()) {
int cur = rdr.Read_int(fld_id);
diff --git a/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr.java b/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr.java
index 79f0851fb..223067dda 100644
--- a/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr.java
+++ b/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.users.prefs; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*;
import gplx.core.primitives.*; import gplx.html.*; import gplx.gfui.*;
+import gplx.xowa.gui.views.*;
public class Prefs_mgr implements GfoInvkAble {
public Prefs_mgr(Xoae_app app) {
this.app = app;
@@ -27,7 +28,7 @@ public class Prefs_mgr implements GfoInvkAble {
html_wtr = new Prefs_html_wtr(this);
} private Xoae_app app; private Hash_adp_bry atrs_hash; private Html_parser html_rdr = new Html_parser(); private Prefs_html_wtr html_wtr;
private Prefs_trg_mgr option_trgs_mgr = new Prefs_trg_mgr();
- public void Html_box_mok_(Gfui_html v) {this.html_box_mok = v;} private Gfui_html html_box_mok;
+ public void Html_box_mok_(Xog_html_itm v) {this.html_box_mok = v;} private Xog_html_itm html_box_mok;
public byte[] Props_get(byte[] src) {
// option_trgs_mgr.Init(app.Gui_mgr().Browser_win().Active_page().Url());
if (props_get_fmtr == null) props_get_fmtr = Bry_fmtr.keys_().Eval_mgr_(app.Gfs_mgr().Eval_mgr());
@@ -76,14 +77,14 @@ public class Prefs_mgr implements GfoInvkAble {
if (eval_code == null) eval_code = hnde.Atrs_val_by_key_bry(Bry_prop_set);
String hnde_val = null;
String hnde_key = "xowa_prop_" + Int_.Xto_str(i);
- Gfui_html html_box = html_box_mok == null ? app.Gui_mgr().Browser_win().Active_tab().Html_itm().Html_box() : html_box_mok; // TEST:
+ Xog_html_itm html_itm = html_box_mok == null ? app.Gui_mgr().Browser_win().Active_tab().Html_itm() : html_box_mok; // TEST:
byte elem_tid = Prefs_mgr.Elem_tid_tid_of(hnde);
switch (elem_tid) {
case Elem_tid_input_text:
case Elem_tid_input_xowa_io:
- case Elem_tid_select: hnde_val = html_box.Html_elem_atr_get_str(hnde_key, gplx.gfui.Gfui_html.Atr_value); break;
- case Elem_tid_textarea: hnde_val = Html_utl.Unescape_as_str(html_box.Html_elem_atr_get_str(hnde_key, gplx.gfui.Gfui_html.Atr_value)); break;
- case Elem_tid_input_checkbox: hnde_val = html_box.Html_elem_atr_get_bool(hnde_key, "checked") ? "y" : "n"; break;
+ case Elem_tid_select: hnde_val = html_itm.Html_elem_atr_get_str(hnde_key, gplx.gfui.Gfui_html.Atr_value); break;
+ case Elem_tid_textarea: hnde_val = Html_utl.Unescape_as_str(html_itm.Html_elem_atr_get_str(hnde_key, gplx.gfui.Gfui_html.Atr_value)); break;
+ case Elem_tid_input_checkbox: hnde_val = html_itm.Html_elem_atr_get_bool(hnde_key, "checked") ? "y" : "n"; break;
}
byte[] get_cmd = Props_get(eval_code);
Object get_val = Eval_run(Bry_.Add(get_cmd, Byte_ascii.Semic));
diff --git a/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java b/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java
index 3209ba001..78ec3498a 100644
--- a/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java
+++ b/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.users.prefs; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*;
import org.junit.*;
import gplx.gfui.*; import gplx.xowa.apps.*;
+import gplx.xowa.gui.views.*;
public class Prefs_mgr_tst {
private Prefs_mgr_fxt fxt = new Prefs_mgr_fxt();
@Before public void init() {fxt.Clear();}
@@ -167,8 +168,12 @@ class Prefs_mgr_fxt {
Tfds.Eq(expd, actl);
}
}
-class Gfui_html_mok extends Gfui_html { private Hash_adp elem_atrs = Hash_adp_.new_();
+class Gfui_html_mok extends Xog_html_itm { private Hash_adp elem_atrs = Hash_adp_.new_();
public void Html_elem_atr_add(String elem_id, String atr_key, Object atr_val) {elem_atrs.Add_if_dupe_use_nth(elem_id + "." + atr_key, atr_val);}
- @Override public String Html_elem_atr_get_str(String elem_id, String atr_key) {return (String)elem_atrs.Get_by(elem_id + "." + atr_key);}
- @Override public boolean Html_elem_atr_get_bool(String elem_id, String atr_key) {return Bool_.parse_((String)elem_atrs.Get_by(elem_id + "." + atr_key));}
+ @Override public String Html_elem_atr_get_str(String id, String atr_key) {
+ return (String)elem_atrs.Get_by(id + "." + atr_key);
+ }
+ @Override public boolean Html_elem_atr_get_bool(String id, String atr_key) {
+ return Bool_.parse_((String)elem_atrs.Get_by(id + "." + atr_key));
+ }
}
diff --git a/400_xowa/src/gplx/xowa/wikis/Xoa_wiki_mgr.java b/400_xowa/src/gplx/xowa/wikis/Xoa_wiki_mgr.java
index a8fa97a2f..926a320e7 100644
--- a/400_xowa/src/gplx/xowa/wikis/Xoa_wiki_mgr.java
+++ b/400_xowa/src/gplx/xowa/wikis/Xoa_wiki_mgr.java
@@ -17,6 +17,6 @@ along with this program. If not, see .
*/
package gplx.xowa.wikis; import gplx.*; import gplx.xowa.*;
public interface Xoa_wiki_mgr {
- Xow_wiki Get_by_key_or_make_2(byte[] key);
- Xow_wiki Get_by_key_or_make_3(byte[] key);
+ Xow_wiki Get_by_key_or_make_init_y(byte[] key);
+ Xow_wiki Get_by_key_or_make_init_n(byte[] key);
}
diff --git a/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java b/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java
index b74ddb302..d7b706a9a 100644
--- a/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java
+++ b/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java
@@ -37,13 +37,13 @@ public class Xoae_wiki_mgr implements Xoa_wiki_mgr, GfoInvkAble {
public Xowe_wiki Get_at(int i) {return Int_.Between(i, 0, this.Count() - 1) ? (Xowe_wiki)list.Get_at(i) : null;}
public Xowe_wiki Get_by_key_or_null(byte[] key) {return Bry_.Len_eq_0(key) ? null : (Xowe_wiki)hash.Get_by(key);}
public Xowe_wiki Get_by_key_or_null(byte[] src, int bgn, int end) {return (Xowe_wiki)hash.Get_by_mid(src, bgn, end);}
- public Xow_wiki Get_by_key_or_make_2(byte[] key) {
+ public Xow_wiki Get_by_key_or_make_init_y(byte[] key) {
Xowe_wiki rv = this.Get_by_key_or_null(key);
if (rv == null) rv = New_wiki(key);
rv.Init_assert();
return rv;
}
- public Xow_wiki Get_by_key_or_make_3(byte[] key) {return Get_by_key_or_make(key);}
+ public Xow_wiki Get_by_key_or_make_init_n(byte[] key) {return Get_by_key_or_make(key);}
public Xowe_wiki Get_by_key_or_make(byte[] key) {
Xowe_wiki rv = this.Get_by_key_or_null(key);
if (rv == null) rv = New_wiki(key);
diff --git a/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_file_schema_props.java b/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_file_schema_props.java
index e497dd84a..0bc1a3655 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_file_schema_props.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_file_schema_props.java
@@ -32,8 +32,7 @@ public class Xowd_db_file_schema_props {
}
public static final String Grp = Xow_cfg_consts.Grp__wiki_schema;
public static final String
- Key__col_page_html_text_id = "col.page.page_html_text_id"
- , Key__tbl_css_core = "tbl.css_core" // VERSION:2.4.1
+ Key__tbl_css_core = "tbl.css_core" // VERSION:2.4.1
, Key__col_search_word_page_count = "col.search_word.word_page_count" // VERSION:2.4.2
;
}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_mgr.java b/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_mgr.java
index 8e943515e..f90a259e1 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_mgr.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/Xowd_db_mgr.java
@@ -89,7 +89,6 @@ public class Xowd_db_mgr {
db__core.Tbl__cat_link().Create_tbl();
}
Dbs__add_and_save(db__core);
- db__core.Tbl__cfg().Insert_yn(Xow_cfg_consts.Grp__wiki_schema, Xowd_db_file_schema_props.Key__col_page_html_text_id, Bool_.Y);
props.Cfg_save(db__core.Tbl__cfg()); // NOTE: must save cfg now, especially zip_tid; latter will be reloaded after import is done;
conn.Txn_end();
}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java
index b6d59b795..acce74a55 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java
@@ -51,7 +51,7 @@ public class Xowd_cat_core_tbl implements RlsAble {
public void Update_by_batch(int id, byte hidden) {
stmt_update.Clear().Val_byte(fld_hidden, hidden).Crt_int(fld_id, id).Exec_update();
}
- public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empy).Exec_delete();;}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();;}
public Xowd_category_itm Select(int id) {
if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_id);
Db_rdr rdr = stmt_select.Clear().Crt_int(fld_id, id).Exec_select__rls_manual();
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java
index 3e2108ca9..552f422dd 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java
@@ -50,7 +50,7 @@ public class Xowd_cat_link_tbl implements RlsAble {
.Val_int(fld_timestamp , timestamp)
.Exec_insert();
}
- public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empy).Exec_delete();}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
public int Select_by_type(List_adp list, int cat_page_id, byte arg_tid, byte[] arg_sortkey, boolean arg_is_from, int limit) {
String arg_sortkey_str = arg_sortkey == null ? "" : String_.new_u8(arg_sortkey);
gplx.core.criterias.Criteria comp_crt = !arg_is_from
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_html_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_html_tbl.java
index 3cdfa8ef6..eaf8d9ba6 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_html_tbl.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_html_tbl.java
@@ -61,14 +61,11 @@ public class Xowd_html_tbl implements RlsAble {
stmt_select = Db_stmt_.Rls(stmt_select);
}
public static void Assert_col__page_html_db_id(Xowd_db_mgr db_mgr) {
- Db_cfg_tbl cfg_tbl = db_mgr.Tbl__cfg();
- String exists = cfg_tbl.Select_str_or(Xow_cfg_consts.Grp__wiki_schema, Xowd_db_file_schema_props.Key__col_page_html_text_id, "n");
- if (String_.Eq(exists, "y")) return;
- Xowd_page_tbl pg_tbl = db_mgr.Tbl__page();
- Db_conn conn = db_mgr.Db__core().Conn();
- conn.Ddl_append_fld(pg_tbl.Tbl_name(), pg_tbl.Fld_html_db_id()); // TODO: currently NULL; change to NOT NULL DEFAULT -1; ALTER TABLE page ADD html_db_id int NULL;
-// conn.Ddl_append_fld(pg_tbl.Tbl_name(), pg_tbl.Fld_page_redirect_id()); // TODO: currently NULL; change to NOT NULL DEFAULT -1; ALTER TABLE page ADD html_db_id int NULL;
- cfg_tbl.Insert_yn(Xow_cfg_consts.Grp__wiki_schema, Xowd_db_file_schema_props.Key__col_page_html_text_id, Bool_.Y);
- pg_tbl.Hdump_enabled_(Bool_.Y);
+ Xowd_page_tbl page_tbl = db_mgr.Tbl__page(); Db_conn page_conn = page_tbl.Conn();
+ boolean html_flds_exists = page_conn.Meta_fld_exists(page_tbl.Tbl_name(), page_tbl.Fld_html_db_id());
+ if (html_flds_exists) return;
+ page_conn.Ddl_append_fld(page_tbl.Tbl_name(), Db_meta_fld.new_int(page_tbl.Fld_html_db_id()).Default_(-1));
+ page_conn.Ddl_append_fld(page_tbl.Tbl_name(), Db_meta_fld.new_int(page_tbl.Fld_redirect_id()).Default_(-1));
+ page_tbl.Hdump_enabled_(Bool_.Y);
}
}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java
index 26e2af975..d34297665 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java
@@ -29,7 +29,8 @@ public class Xowd_page_tbl implements RlsAble {
public String Fld_page_ns() {return fld_ns;}
public String Fld_page_title() {return fld_title;}
public String Fld_page_len() {return fld_len;}
- public Db_meta_fld Fld_html_db_id() {return flds.Get_by(fld_html_db_id);}
+ public String Fld_html_db_id() {return fld_html_db_id;}
+ public String Fld_redirect_id() {return fld_redirect_id;}
public String[] Flds_select_idx() {return flds_select_idx;}
public String[] Flds_select_all() {return flds_select_all;}
public Db_conn Conn() {return conn;}
@@ -162,7 +163,7 @@ public class Xowd_page_tbl implements RlsAble {
if (Bry_.Len_eq_0(search)) return; // do not allow empty search
Criteria crt = Criteria_.And_many(Db_crt_.eq_(fld_ns, Xow_ns_.Id_main), Db_crt_.like_(fld_title, ""));
Db_qry__select_cmd qry = Db_qry_.select_().From_(tbl_name).Cols_(fld_id, fld_len, fld_ns, fld_title).Where_(crt); // NOTE: use fields from main index only
- search = Bry_.Replace(search, Byte_ascii.Asterisk, Byte_ascii.Percent);
+ search = Bry_.Replace(search, Byte_ascii.Star, Byte_ascii.Percent);
Db_rdr rdr = conn.Stmt_new(qry).Clear().Crt_int(fld_ns, Xow_ns_.Id_main).Val_bry_as_str(fld_title, search).Exec_select__rls_auto();
try {
while (rdr.Move_next()) {
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_search_word_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_search_word_tbl.java
index f6ca4e167..f25b6fc0c 100644
--- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_search_word_tbl.java
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_search_word_tbl.java
@@ -56,7 +56,7 @@ public class Xowd_search_word_tbl implements RlsAble {
stmt_select_in = conn.Stmt_new(qry);
}
List_adp list = List_adp_.new_();
- Db_rdr rdr = stmt_select_in.Clear().Crt_bry_as_str(fld_text, Bry_.Replace(word, Byte_ascii.Asterisk, Byte_ascii.Percent)).Exec_select__rls_manual();
+ Db_rdr rdr = stmt_select_in.Clear().Crt_bry_as_str(fld_text, Bry_.Replace(word, Byte_ascii.Star, Byte_ascii.Percent)).Exec_select__rls_manual();
try {
int row_count = 0;
while (rdr.Move_next()) {
@@ -72,8 +72,8 @@ public class Xowd_search_word_tbl implements RlsAble {
}
public void Select_by_word(Cancelable cancelable, Xowd_search_link_tbl search_page_tbl, List_adp rv, byte[] search, int results_max) {
gplx.core.criterias.Criteria crt = null;
- if (Bry_.Has(search, Byte_ascii.Asterisk)) {
- search = Bry_.Replace(search, Byte_ascii.Asterisk, Byte_ascii.Percent);
+ if (Bry_.Has(search, Byte_ascii.Star)) {
+ search = Bry_.Replace(search, Byte_ascii.Star, Byte_ascii.Percent);
crt = Db_crt_.like_ (fld_text, String_.new_u8(search));
}
else
@@ -97,9 +97,9 @@ public class Xowd_search_word_tbl implements RlsAble {
flds.Add_int_dflt("word_page_count", 0);
}
public void Ddl__page_count__add(Xowd_search_link_tbl link_tbl, Db_cfg_tbl cfg_tbl) {
- Db_meta_fld page_count_fld = new Db_meta_fld("word_page_count", Db_meta_fld.Tid_int, Db_meta_fld.Len_null, Bool_.N, Bool_.N, Bool_.N, 0);
+ Db_meta_fld page_count_fld = Db_meta_fld.new_int("word_page_count").Default_(0);
conn.Txn_bgn();
- conn.Ddl_append_fld(tbl_name, page_count_fld); // ALTER TABLE search_word ADD word_page_count integer NOT NULL DEFAULT 0;
+ conn.Ddl_append_fld(tbl_name, page_count_fld); // SQL: ALTER TABLE search_word ADD word_page_count integer NOT NULL DEFAULT 0;
String sql = String_.Format(String_.Concat_lines_nl_skip_last
( "REPLACE INTO {0} ({1}, {2}, word_page_count)"
, "SELECT w.{1}"
@@ -114,7 +114,7 @@ public class Xowd_search_word_tbl implements RlsAble {
);
conn.Exec_sql_plog_ntx("calculating page count per word (please wait)", sql);
Ddl__page_count__cfg(cfg_tbl);
- fld_page_count = page_count_fld.Name(); flds.Add_itm(page_count_fld); this.Rls();
+ fld_page_count = page_count_fld.Name(); flds.Add(page_count_fld); this.Rls();
conn.Txn_end();
}
public void Ddl__page_count__cfg(Db_cfg_tbl cfg_tbl) {
diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java
index 738730007..815864ff9 100644
--- a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java
+++ b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java
@@ -61,7 +61,7 @@ public class Xow_xwiki_mgr implements GfoInvkAble {
return (Xow_domain[])rv.To_ary_and_clear(Xow_domain.class);
}
public void Add_bulk(byte[] raw) {
- byte[][] rows = Bry_.Split(raw, Byte_ascii.NewLine);
+ byte[][] rows = Bry_.Split(raw, Byte_ascii.Nl);
int rows_len = rows.length;
Hash_adp_bry lang_regy = Xol_lang_itm_.Regy();
for (int i = 0; i < rows_len; i++) {
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_mgr.java b/400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_mgr.java
similarity index 95%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_mgr.java
rename to 400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_mgr.java
index 977c90577..6a848cd8f 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_mgr.java
+++ b/400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_mgr.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa.xtns.wdatas.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+package gplx.xowa.wmfs; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.wmfs.data.*;
public class Xow_wmf_api_mgr {
public void Trg_engine_key(String v) {this.trg_engine_key = v;} private String trg_engine_key = gplx.ios.IoEngine_.SysKey;
public void Api_exec(Xow_wmf_api_wkr wkr) {this.Api_exec(Wikis, wkr);}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_wkr.java b/400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_wkr.java
similarity index 86%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_wkr.java
rename to 400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_wkr.java
index d1de8cb88..71c45c50e 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_wkr.java
+++ b/400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_wkr.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa.xtns.wdatas.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+package gplx.xowa.wmfs; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.wmfs.data.*;
public interface Xow_wmf_api_wkr {
void Api_init();
void Api_term();
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_wkr__ns.java b/400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_wkr__ns.java
similarity index 93%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_wkr__ns.java
rename to 400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_wkr__ns.java
index 34019e6d0..6ebc050f6 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xow_wmf_api_wkr__ns.java
+++ b/400_xowa/src/gplx/xowa/wmfs/Xow_wmf_api_wkr__ns.java
@@ -15,9 +15,10 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa.xtns.wdatas.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+package gplx.xowa.wmfs; import gplx.*; import gplx.xowa.*;
import gplx.json.*;
-class Xow_wmf_api_wkr__ns implements Xow_wmf_api_wkr {
+import gplx.xowa.wmfs.data.*;
+public class Xow_wmf_api_wkr__ns implements Xow_wmf_api_wkr {
private final Json_parser parser = new Json_parser();
private final Xowmf_site_tbl tbl_site; private final Xowmf_ns_tbl tbl_ns;
private int site_id_next = 1;
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_extensions_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_extensions_tbl.java
new file mode 100644
index 000000000..1ed91c9a6
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_extensions_tbl.java
@@ -0,0 +1,69 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+class Xowmf_extensions_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_extensions"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_site_id, fld_type, fld_name, fld_descriptionmsg, fld_author, fld_url, fld_version
+ , fld_vcs_system, fld_vcs_version, fld_vcs_url, fld_vcs_date, fld_license_name, fld_license, fld_credits;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert;
+ public Xowmf_extensions_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_site_id = flds.Add_int("site_id");
+ this.fld_type = flds.Add_str("type", 255);
+ this.fld_name = flds.Add_str("name", 255);
+ this.fld_descriptionmsg = flds.Add_str("descriptionmsg", 255);
+ this.fld_author = flds.Add_str("author", 255);
+ this.fld_url = flds.Add_str("url", 255);
+ this.fld_version = flds.Add_str("version", 255);
+ this.fld_vcs_system = flds.Add_str("vcs_system", 255);
+ this.fld_vcs_version = flds.Add_str("vcs_version", 255);
+ this.fld_vcs_url = flds.Add_str("vcs_url", 255);
+ this.fld_vcs_date = flds.Add_str("vcs_date", 255);
+ this.fld_license_name = flds.Add_str("license_name", 255);
+ this.fld_license = flds.Add_str("license", 255);
+ this.fld_credits = flds.Add_str("credits", 255);
+ conn.Rls_reg(this);
+ }
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id)));}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ }
+ public void Insert(int site_id, String type, String name, String descriptionmsg, String author, String url, String version
+ , String vcs_system, String vcs_version, String vcs_url, String vcs_date, String license_name, String license, String credits) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear()
+ .Val_int(fld_site_id , site_id)
+ .Val_str(fld_type , type)
+ .Val_str(fld_name , name)
+ .Val_str(fld_descriptionmsg , descriptionmsg)
+ .Val_str(fld_author , author)
+ .Val_str(fld_url , url)
+ .Val_str(fld_version , version)
+ .Val_str(fld_vcs_system , vcs_system)
+ .Val_str(fld_vcs_version , vcs_version)
+ .Val_str(fld_vcs_url , vcs_url)
+ .Val_str(fld_vcs_date , vcs_date)
+ .Val_str(fld_license_name , license_name)
+ .Val_str(fld_license , license)
+ .Val_str(fld_credits , credits)
+ .Exec_insert();
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xowmf_site_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_general_tbl.java
similarity index 63%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xowmf_site_tbl.java
rename to 400_xowa/src/gplx/xowa/wmfs/data/Xowmf_general_tbl.java
index 4b03ca677..882fb36f7 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xowmf_site_tbl.java
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_general_tbl.java
@@ -15,9 +15,9 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa.xtns.wdatas.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
import gplx.dbs.*;
-class Xowmf_general_tbl implements RlsAble {
+public class Xowmf_general_tbl implements RlsAble {
private static final String tbl_name = "wmf_general"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
private final String fld_site_id, fld_key, fld_val;
private final Db_conn conn;
@@ -35,7 +35,7 @@ class Xowmf_general_tbl implements RlsAble {
stmt_insert = Db_stmt_.Rls(stmt_insert);
stmt_select = Db_stmt_.Rls(stmt_select);
}
- public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empy).Exec_delete();}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
public void Insert(int site_id, String key, String val) {
if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
stmt_insert.Clear().Val_int(fld_site_id, site_id).Val_str(fld_key, key).Val_str(fld_val, val).Exec_insert();
@@ -231,121 +231,3 @@ class Xowmf_general_tbl implements RlsAble {
],
"favicon": "//bits.wikimedia.org/favicon/wikipedia.ico"
*/
-class Xowmf_json_tbl implements RlsAble {
- private static final String tbl_name = "wmf_json"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
- private final String fld_site_id, fld_text, fld_date;
- private final Db_conn conn;
- private Db_stmt stmt_insert, stmt_select;
- public Xowmf_json_tbl(Db_conn conn) {
- this.conn = conn;
- this.fld_site_id = flds.Add_int("site_id");
- this.fld_date = flds.Add_str("json_date", 20);
- this.fld_text = flds.Add_text("json_text");
- conn.Rls_reg(this);
- }
- public Db_conn Conn() {return conn;}
- public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id)));}
- public void Rls() {
- stmt_insert = Db_stmt_.Rls(stmt_insert);
- stmt_select = Db_stmt_.Rls(stmt_select);
- }
- public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empy).Exec_delete();}
- public void Insert(int site_id, DateAdp date, byte[] text) {
- if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
- stmt_insert.Clear().Val_int(fld_site_id, site_id).Val_str(fld_date, date.XtoStr_gplx()).Val_bry_as_str(fld_text, text).Exec_insert();
- }
- public String Select_text_or_null(int site_id) {
- if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_site_id);
- Db_rdr rdr = stmt_select.Clear().Crt_int(fld_site_id, site_id).Exec_select__rls_manual();
- try {
- return rdr.Move_next() ? rdr.Read_str(fld_text) : null;
- }
- finally {rdr.Rls();}
- }
-}
-class Xowmf_site_tbl implements RlsAble {
- private static final String tbl_name = "wmf_site"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
- private final String fld_id, fld_name;
- private final Db_conn conn;
- private Db_stmt stmt_insert, stmt_select;
- public Xowmf_site_tbl(Db_conn conn) {
- this.conn = conn;
- this.fld_id = flds.Add_int_pkey("site_id");
- this.fld_name = flds.Add_str("site_name", 255);
- conn.Rls_reg(this);
- }
- public Db_conn Conn() {return conn;}
- public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "name", fld_name)));}
- public void Rls() {
- stmt_insert = Db_stmt_.Rls(stmt_insert);
- stmt_select = Db_stmt_.Rls(stmt_select);
- }
- public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empy).Exec_delete();}
- public void Insert(int id, String name) {
- if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
- stmt_insert.Clear().Val_int(fld_id, id).Val_str(fld_name, name).Exec_insert();
- }
- public int Select_id(String name) {
- if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_name);
- Db_rdr rdr = stmt_select.Clear().Crt_str(fld_name, name).Exec_select__rls_manual();
- try {
- return rdr.Move_next() ? rdr.Read_int(fld_id) : -1;
- }
- finally {rdr.Rls();}
- }
- public static Db_conn Get_conn_or_new(Io_url xowa_root) {
- Io_url wmf_data_url = xowa_root.GenSubFil_nest("bin", "any", "xowa", "cfg", "wiki", "wmf_data.sqlite3");
- Db_conn_bldr_data conn_data = Db_conn_bldr.I.Get_or_new(wmf_data_url);
- Db_conn conn = conn_data.Conn();
- if (conn_data.Created()) {
- Xowmf_site_tbl site_tbl = new Xowmf_site_tbl(conn); site_tbl.Create_tbl();
- Xowmf_ns_tbl itm_tbl = new Xowmf_ns_tbl(conn); itm_tbl.Create_tbl();
- }
- return conn;
- }
-}
-class Xowmf_ns_tbl implements RlsAble {
- private static final String tbl_name = "wmf_ns"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
- private final String fld_site_id, fld_id, fld_case, fld_subpages, fld_content, fld_name, fld_canonical;
- private final Db_conn conn;
- private Db_stmt stmt_insert, stmt_select;
- public Xowmf_ns_tbl(Db_conn conn) {
- this.conn = conn;
- this.fld_site_id = flds.Add_int("site_id");
- this.fld_id = flds.Add_int("ns_id");
- this.fld_case = flds.Add_byte("ns_case");
- this.fld_subpages = flds.Add_byte("ns_subpages");
- this.fld_content = flds.Add_byte("ns_content");
- this.fld_name = flds.Add_str("ns_name", 255);
- this.fld_canonical = flds.Add_str("ns_canonical", 255);
- conn.Rls_reg(this);
- }
- public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id, fld_id)));}
- public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empy).Exec_delete();}
- public void Rls() {
- stmt_insert = Db_stmt_.Rls(stmt_insert);
- stmt_select = Db_stmt_.Rls(stmt_select);
- }
- public void Insert(int site_id, int id, byte case_match, boolean subpages, boolean content, byte[] name, byte[] canonical) {
- if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
- stmt_insert.Clear()
- .Val_int(fld_site_id, site_id).Val_int(fld_id, id).Val_byte(fld_case, case_match).Val_bool_as_byte(fld_subpages, subpages).Val_bool_as_byte(fld_content, content)
- .Val_bry_as_str(fld_name, name).Val_bry_as_str(fld_canonical, canonical).Exec_insert();
- }
- public void Select_all(Xow_ns_mgr rv, int site_id) {
- if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_site_id);
- Db_rdr rdr = stmt_select.Clear().Crt_int(fld_site_id, site_id).Exec_select__rls_manual();
- rv.Clear();
- try {
- while (rdr.Move_next()) {
- rv.Add_new
- ( rdr.Read_int (fld_id)
- , rdr.Read_bry_by_str (fld_name)
- , rdr.Read_byte (fld_case)
- , Bool_.N);
- }
- }
- finally {rdr.Rls();}
- rv.Init();
- }
-}
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_interwikimap_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_interwikimap_tbl.java
new file mode 100644
index 000000000..e16068442
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_interwikimap_tbl.java
@@ -0,0 +1,53 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+class Xowmf_interwikimap_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_interwikimap"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_site_id, fld_prefix, fld_local, fld_language, fld_localinterwiki, fld_url, fld_protorel;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert;
+ public Xowmf_interwikimap_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_site_id = flds.Add_int("site_id");
+ this.fld_prefix = flds.Add_str("prefix", 255);
+ this.fld_local = flds.Add_str("local", 255);
+ this.fld_language = flds.Add_str("language", 255);
+ this.fld_localinterwiki = flds.Add_str("localinterwiki", 255);
+ this.fld_url = flds.Add_str("url", 255);
+ this.fld_protorel = flds.Add_str("protorel", 255);
+ conn.Rls_reg(this);
+ }
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id)));}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ }
+ public void Insert(int site_id, String prefix, String local, String language, String localinterwiki, String url, String protorel) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear()
+ .Val_int(fld_site_id , site_id)
+ .Val_str(fld_prefix , prefix)
+ .Val_str(fld_local , local)
+ .Val_str(fld_language , language)
+ .Val_str(fld_localinterwiki , localinterwiki)
+ .Val_str(fld_url , url)
+ .Val_str(fld_protorel , protorel)
+ .Exec_insert();
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_json_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_json_tbl.java
new file mode 100644
index 000000000..37f6eb5c3
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_json_tbl.java
@@ -0,0 +1,51 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+public class Xowmf_json_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_json"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_site_id, fld_text, fld_date;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert, stmt_select;
+ public Xowmf_json_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_site_id = flds.Add_int("site_id");
+ this.fld_date = flds.Add_str("json_date", 20);
+ this.fld_text = flds.Add_text("json_text");
+ conn.Rls_reg(this);
+ }
+ public Db_conn Conn() {return conn;}
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id)));}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ stmt_select = Db_stmt_.Rls(stmt_select);
+ }
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Insert(int site_id, DateAdp date, byte[] text) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear().Val_int(fld_site_id, site_id).Val_str(fld_date, date.XtoStr_gplx()).Val_bry_as_str(fld_text, text).Exec_insert();
+ }
+ public String Select_text_or_null(int site_id) {
+ if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_site_id);
+ Db_rdr rdr = stmt_select.Clear().Crt_int(fld_site_id, site_id).Exec_select__rls_manual();
+ try {
+ return rdr.Move_next() ? rdr.Read_str(fld_text) : null;
+ }
+ finally {rdr.Rls();}
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_ns_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_ns_tbl.java
new file mode 100644
index 000000000..8d86ab013
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_ns_tbl.java
@@ -0,0 +1,64 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+public class Xowmf_ns_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_ns"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_site_id, fld_id, fld_case, fld_subpages, fld_content, fld_name, fld_canonical;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert, stmt_select;
+ public Xowmf_ns_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_site_id = flds.Add_int("site_id");
+ this.fld_id = flds.Add_int("ns_id");
+ this.fld_case = flds.Add_byte("ns_case");
+ this.fld_subpages = flds.Add_byte("ns_subpages");
+ this.fld_content = flds.Add_byte("ns_content");
+ this.fld_name = flds.Add_str("ns_name", 255);
+ this.fld_canonical = flds.Add_str("ns_canonical", 255);
+ conn.Rls_reg(this);
+ }
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id, fld_id)));}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ stmt_select = Db_stmt_.Rls(stmt_select);
+ }
+ public void Insert(int site_id, int id, byte case_match, boolean subpages, boolean content, byte[] name, byte[] canonical) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear()
+ .Val_int(fld_site_id, site_id).Val_int(fld_id, id).Val_byte(fld_case, case_match).Val_bool_as_byte(fld_subpages, subpages).Val_bool_as_byte(fld_content, content)
+ .Val_bry_as_str(fld_name, name).Val_bry_as_str(fld_canonical, canonical).Exec_insert();
+ }
+ public void Select_all(Xow_ns_mgr rv, int site_id) {
+ if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_site_id);
+ Db_rdr rdr = stmt_select.Clear().Crt_int(fld_site_id, site_id).Exec_select__rls_manual();
+ rv.Clear();
+ try {
+ while (rdr.Move_next()) {
+ rv.Add_new
+ ( rdr.Read_int (fld_id)
+ , rdr.Read_bry_by_str (fld_name)
+ , rdr.Read_byte (fld_case)
+ , Bool_.N);
+ }
+ }
+ finally {rdr.Rls();}
+ rv.Init();
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_site_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_site_tbl.java
new file mode 100644
index 000000000..007f33429
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_site_tbl.java
@@ -0,0 +1,60 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+public class Xowmf_site_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_site"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_id, fld_name;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert, stmt_select;
+ public Xowmf_site_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_id = flds.Add_int_pkey("site_id");
+ this.fld_name = flds.Add_str("site_name", 255);
+ conn.Rls_reg(this);
+ }
+ public Db_conn Conn() {return conn;}
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "name", fld_name)));}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ stmt_select = Db_stmt_.Rls(stmt_select);
+ }
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Insert(int id, String name) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear().Val_int(fld_id, id).Val_str(fld_name, name).Exec_insert();
+ }
+ public int Select_id(String name) {
+ if (stmt_select == null) stmt_select = conn.Stmt_select(tbl_name, flds, fld_name);
+ Db_rdr rdr = stmt_select.Clear().Crt_str(fld_name, name).Exec_select__rls_manual();
+ try {
+ return rdr.Move_next() ? rdr.Read_int(fld_id) : -1;
+ }
+ finally {rdr.Rls();}
+ }
+ public static Db_conn Get_conn_or_new(Io_url xowa_root) {
+ Io_url wmf_data_url = xowa_root.GenSubFil_nest("bin", "any", "xowa", "cfg", "wiki", "wmf_data.sqlite3");
+ Db_conn_bldr_data conn_data = Db_conn_bldr.I.Get_or_new(wmf_data_url);
+ Db_conn conn = conn_data.Conn();
+ if (conn_data.Created()) {
+ Xowmf_site_tbl site_tbl = new Xowmf_site_tbl(conn); site_tbl.Create_tbl();
+ Xowmf_ns_tbl itm_tbl = new Xowmf_ns_tbl(conn); itm_tbl.Create_tbl();
+ }
+ return conn;
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_specialpagealiases_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_specialpagealiases_tbl.java
new file mode 100644
index 000000000..c16e7ccd8
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_specialpagealiases_tbl.java
@@ -0,0 +1,45 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+class Xowmf_specialpagealiases_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_specialpagealiases"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_site_id, fld_realname, fld_aliases;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert;
+ public Xowmf_specialpagealiases_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_site_id = flds.Add_int("site_id");
+ this.fld_realname = flds.Add_str("realname", 255);
+ this.fld_aliases = flds.Add_str("aliases", 2048);
+ conn.Rls_reg(this);
+ }
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id)));}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ }
+ public void Insert(int site_id, String realname, String[] aliases) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear()
+ .Val_int(fld_site_id , site_id)
+ .Val_str(fld_realname , realname)
+ .Val_str(fld_aliases , String_.Concat_with_str("|", aliases))
+ .Exec_insert();
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_statistics_tbl.java b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_statistics_tbl.java
new file mode 100644
index 000000000..0d169a2b6
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wmfs/data/Xowmf_statistics_tbl.java
@@ -0,0 +1,57 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.wmfs.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wmfs.*;
+import gplx.dbs.*;
+class Xowmf_statistics_tbl implements RlsAble {
+ private static final String tbl_name = "wmf_statistics"; private final Db_meta_fld_list flds = new Db_meta_fld_list();
+ private final String fld_site_id, fld_pages, fld_articles, fld_edits, fld_images, fld_users, fld_activeusers, fld_admins, fld_queued_massmessages;
+ private final Db_conn conn;
+ private Db_stmt stmt_insert;
+ public Xowmf_statistics_tbl(Db_conn conn) {
+ this.conn = conn;
+ this.fld_site_id = flds.Add_int("site_id");
+ this.fld_pages = flds.Add_long("pages");
+ this.fld_articles = flds.Add_long("articles");
+ this.fld_edits = flds.Add_long("edits");
+ this.fld_images = flds.Add_long("images");
+ this.fld_users = flds.Add_long("users");
+ this.fld_activeusers = flds.Add_long("activeusers");
+ this.fld_admins = flds.Add_long("admins");
+ this.fld_queued_massmessages = flds.Add_long("queued_massmessages");
+ conn.Rls_reg(this);
+ }
+ public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_name(tbl_name, "main", fld_site_id)));}
+ public void Delete_all() {conn.Stmt_delete(tbl_name, Db_meta_fld.Ary_empty).Exec_delete();}
+ public void Rls() {
+ stmt_insert = Db_stmt_.Rls(stmt_insert);
+ }
+ public void Insert(int site_id, long pages, long articles, long edits, long images, long users, long activeusers, long admins, long queued_massmessages) {
+ if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds);
+ stmt_insert.Clear()
+ .Val_int(fld_site_id , site_id)
+ .Val_long(fld_pages , pages)
+ .Val_long(fld_articles , articles)
+ .Val_long(fld_edits , edits)
+ .Val_long(fld_images , images)
+ .Val_long(fld_users , users)
+ .Val_long(fld_activeusers , activeusers)
+ .Val_long(fld_admins , admins)
+ .Val_long(fld_queued_massmessages , queued_massmessages)
+ .Exec_insert();
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/cite/Ref_html_wtr_cfg.java b/400_xowa/src/gplx/xowa/xtns/cite/Ref_html_wtr_cfg.java
index 13c5e7848..f419226a7 100644
--- a/400_xowa/src/gplx/xowa/xtns/cite/Ref_html_wtr_cfg.java
+++ b/400_xowa/src/gplx/xowa/xtns/cite/Ref_html_wtr_cfg.java
@@ -102,7 +102,7 @@ public class Ref_html_wtr_cfg {
boolean last = pos == len;
byte b = last ? Byte_ascii.Space : raw[pos];
switch (b) {
- case Byte_ascii.Space: case Byte_ascii.NewLine: case Byte_ascii.Tab:
+ case Byte_ascii.Space: case Byte_ascii.Nl: case Byte_ascii.Tab:
if (bgn != -1) { // guard against leading ws, or multiple ws; EX: "bos\s\s" or "\s\s"
list.Add(Bry_.Mid(raw, bgn, pos));
bgn = -1;
diff --git a/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_itm.java b/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_itm.java
index 9db099cfd..b50bb04d9 100644
--- a/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_itm.java
+++ b/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_itm.java
@@ -64,7 +64,7 @@ class Dpl_itm {
key_id = Dpl_itm_keys.Parse(src, fld_bgn, fld_end, Dpl_itm_keys.Key_null);
if (key_id == Dpl_itm_keys.Key_null) { // unknown key; warn and set pos to end of line; EX: "unknown=";
Parse_missing_key(usr_dlg, page_ttl, src, fld_bgn, fld_end);
- fld_bgn = Bry_finder.Find_fwd(src, Byte_ascii.NewLine, pos);
+ fld_bgn = Bry_finder.Find_fwd(src, Byte_ascii.Nl, pos);
if (fld_bgn == Bry_.NotFound) loop = false;
}
else { // known key; set pos to val_bgn
@@ -92,7 +92,7 @@ class Dpl_itm {
++pos;
}
}
- private static final byte Dlm_fld = Byte_ascii.Eq, Dlm_row = Byte_ascii.NewLine;
+ private static final byte Dlm_fld = Byte_ascii.Eq, Dlm_row = Byte_ascii.Nl;
public void Parse_cmd(Xowe_wiki wiki, byte key_id, byte[] val) {
sub_root.Clear();
val = wiki.Parser().Parse_text_to_wtxt(sub_root, sub_ctx, sub_tkn_mkr, val);
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java
index dae1b9a48..0c6c1bb64 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java
@@ -143,8 +143,8 @@ public class Gallery_itm_parser {
cur_byte = src[cur_pos];
switch (cur_byte) {
case Byte_ascii.Pipe: return Mode_pipe;
- case Byte_ascii.NewLine: return Mode_nl;
- case Byte_ascii.CarriageReturn:
+ case Byte_ascii.Nl: return Mode_nl;
+ case Byte_ascii.Cr:
case Byte_ascii.Space:
case Byte_ascii.Tab:
++cur_pos;
@@ -209,11 +209,11 @@ public class Gallery_itm_parser {
while (cur_pos < end_pos) {
cur_byte = src[cur_pos];
switch (cur_byte) {
- case Byte_ascii.CarriageReturn:
+ case Byte_ascii.Cr:
case Byte_ascii.Space:
case Byte_ascii.Tab: ++cur_pos; continue; // ignore
case Byte_ascii.Pipe: return Mode_pipe;
- case Byte_ascii.NewLine: return Mode_nl;
+ case Byte_ascii.Nl: return Mode_nl;
default: return Mode_text;
}
}
diff --git a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_html_mgr.java b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_html_mgr.java
index 246a0d132..2c2058dac 100644
--- a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_html_mgr.java
+++ b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_html_mgr.java
@@ -92,7 +92,7 @@ class Hiero_html_mgr {
switch (v[0]) {
case Byte_ascii.Brack_bgn: case Byte_ascii.Brack_end:
case Byte_ascii.Paren_bgn: case Byte_ascii.Paren_end:
- case Byte_ascii.Asterisk: case Byte_ascii.Colon: case Byte_ascii.Bang:
+ case Byte_ascii.Star: case Byte_ascii.Colon: case Byte_ascii.Bang:
amp = true;
break;
}
@@ -122,7 +122,7 @@ class Hiero_html_mgr {
total += line_max;
line_max = 0;
continue;
- case Byte_ascii.Asterisk:
+ case Byte_ascii.Star:
if (height > line_max)
line_max = height;
continue;
@@ -150,7 +150,7 @@ class Hiero_html_mgr {
case Byte_ascii.Colon:
temp_bfr.Add_str_a7("\n
");
continue;
- case Byte_ascii.Asterisk:
+ case Byte_ascii.Star:
temp_bfr.Add_byte_space();
continue;
}
diff --git a/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java b/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java
index 8b13c8e51..47d838d24 100644
--- a/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java
+++ b/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java
@@ -55,7 +55,7 @@ class Imap_parser {
if (itm_end == src_end) break;
itm_bgn = Bry_finder.Trim_fwd_space_tab(src, itm_end + 1, src_end); // trim ws at start, and look for first char
if (itm_bgn == src_end) break; // line is entirely ws and terminated by eos; EX: "\n EOS"
- itm_end = Bry_finder.Find_fwd_until(src, itm_bgn, src_end, Byte_ascii.NewLine); // look for \n
+ itm_end = Bry_finder.Find_fwd_until(src, itm_bgn, src_end, Byte_ascii.Nl); // look for \n
if (itm_end == Bry_finder.Not_found) itm_end = src_end; // no \n; make EOS = \n
itm_end = Bry_finder.Trim_bwd_space_tab(src, itm_end, itm_bgn); // trim any ws at end
if (itm_end - itm_bgn == 0) continue; // line is entirely ws; continue;
@@ -205,13 +205,13 @@ class Imap_parser {
pos = Bry_finder.Trim_fwd_space_tab(src, pos, src_end); // trim ws
if (pos == src_end) break;
byte b = src[pos];
- if (b == Byte_ascii.NewLine) // new-line; end
+ if (b == Byte_ascii.Nl) // new-line; end
break;
else {
Object tid_obj = tid_trie.Match_bgn_w_byte(b, src, pos, src_end);
if (tid_obj == null) { // not a known imap line; assume continuation of img line and skip to next line
imap_ctx.Wiki().Appe().Usr_dlg().Note_many("", "", "image_map extending image over multiple lines; page=~{0} imageMap=~{1}", String_.new_u8(imap_ctx.Cur_page().Ttl().Full_txt()), String_.new_u8(imap_img_src));
- int next_line = Bry_finder.Find_fwd(src, Byte_ascii.NewLine, pos);
+ int next_line = Bry_finder.Find_fwd(src, Byte_ascii.Nl, pos);
if (next_line == Bry_finder.Not_found) next_line = src_end;
rv = next_line;
pos = rv + 1;
diff --git a/400_xowa/src/gplx/xowa/xtns/math/Xof_math_subst_regy.java b/400_xowa/src/gplx/xowa/xtns/math/Xof_math_subst_regy.java
index 4b7c3f9d6..c83bc3bfe 100644
--- a/400_xowa/src/gplx/xowa/xtns/math/Xof_math_subst_regy.java
+++ b/400_xowa/src/gplx/xowa/xtns/math/Xof_math_subst_regy.java
@@ -38,7 +38,7 @@ public class Xof_math_subst_regy {
case Byte_ascii.Curly_end:
case Byte_ascii.Brack_end:
case Byte_ascii.Underline:
- case Byte_ascii.NewLine: // NOTE: needed for \begin\n
+ case Byte_ascii.Nl: // NOTE: needed for \begin\n
break;
default:
if (itm.WholeWord()) {
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_shunter.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_shunter.java
index c1809469d..a9c33c7c0 100644
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_shunter.java
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_shunter.java
@@ -161,7 +161,7 @@ public class Pfunc_expr_shunter {
Btrie_fast_mgr rv = Btrie_fast_mgr.ci_ascii_(); // NOTE:ci.ascii:MW_const.en; math and expressions
Trie_add(rv, new Ws_tkn(Byte_ascii.Space));
Trie_add(rv, new Ws_tkn(Byte_ascii.Tab));
- Trie_add(rv, new Ws_tkn(Byte_ascii.NewLine));
+ Trie_add(rv, new Ws_tkn(Byte_ascii.Nl));
Trie_add(rv, Paren_bgn_tkn._);
Trie_add(rv, Paren_end_tkn._);
Trie_add(rv, new Func_tkn_plus("+"));
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_if.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_if.java
index 3eeeb290e..d0116b07e 100644
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_if.java
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_if.java
@@ -23,7 +23,7 @@ public class Pfunc_if extends Pf_func_base {
boolean val_is_empty = true; int val_len = val.length;
for (int i = 0; i < val_len; i++) {
switch (val[i]) {
- case Byte_ascii.Space: case Byte_ascii.NewLine: case Byte_ascii.Tab: break; // ws; continue
+ case Byte_ascii.Space: case Byte_ascii.Nl: case Byte_ascii.Tab: break; // ws; continue
default: val_is_empty = false; i = val_len; break; // non-ws; break loop
}
}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_iferror.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_iferror.java
index 489931581..cfbbf48db 100644
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_iferror.java
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_iferror.java
@@ -57,7 +57,7 @@ public class Pfunc_iferror extends Pf_func_base {
break;
case State_nde: // <(?:strong|span|p|div)\s
switch (src[pos_nxt]) {
- case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.NewLine:
+ case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.Nl:
state = State_nde;
++pos_nxt;
break;
@@ -67,7 +67,7 @@ public class Pfunc_iferror extends Pf_func_base {
if (state == State_nde) {
valid = true;
switch (src[pos - 1]) {
- case Byte_ascii.Quote: case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.NewLine:
+ case Byte_ascii.Quote: case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.Nl:
break;
default:
valid = false;
@@ -83,14 +83,14 @@ public class Pfunc_iferror extends Pf_func_base {
if (state == State_class) {
valid = true;
switch (src[pos - 1]) {
- case Byte_ascii.Quote: case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.NewLine:
+ case Byte_ascii.Quote: case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.Nl:
break;
default:
valid = false;
break;
}
switch (src[pos_nxt]) {
- case Byte_ascii.Quote: case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.NewLine:
+ case Byte_ascii.Quote: case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.Nl:
break;
default:
valid = false;
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/strings/Pfunc_tag.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/strings/Pfunc_tag.java
index f7c45f11b..a9c1e8ff8 100644
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/strings/Pfunc_tag.java
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/strings/Pfunc_tag.java
@@ -114,7 +114,7 @@ class Pfunc_tag_kv_bldr {
else if (itm_end == -1)
itm_end = i;
break;
- case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.NewLine:// NOTE: do not need to handle ws, b/c argBldr will trim it EX: {{#tag|a| b = c }}; " b " and " c " are automatically trimmed
+ case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.Nl:// NOTE: do not need to handle ws, b/c argBldr will trim it EX: {{#tag|a| b = c }}; " b " and " c " are automatically trimmed
break;
default:
if (itm_bgn == -1) itm_bgn = i;
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pxd_parser.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pxd_parser.java
index 9c312bd32..7124d3f0a 100644
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pxd_parser.java
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pxd_parser.java
@@ -58,7 +58,7 @@ class Pxd_parser {
while (cur_pos < src_len) {
byte b = src[cur_pos];
switch (b) {
- case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.NewLine:
+ case Byte_ascii.Space: case Byte_ascii.Tab: case Byte_ascii.Nl:
if (tkn_type != Pxd_itm_.Tid_ws) MakePrvTkn(cur_pos, Pxd_itm_.Tid_ws); break; // SEE:NOTE_1 for logic
case Byte_ascii.Dash: case Byte_ascii.Dot: case Byte_ascii.Colon: case Byte_ascii.Slash:
if (tkn_type != b) MakePrvTkn(cur_pos, b); break;
diff --git a/400_xowa/src/gplx/xowa/xtns/poems/Poem_nde.java b/400_xowa/src/gplx/xowa/xtns/poems/Poem_nde.java
index a3fcb996b..051cced53 100644
--- a/400_xowa/src/gplx/xowa/xtns/poems/Poem_nde.java
+++ b/400_xowa/src/gplx/xowa/xtns/poems/Poem_nde.java
@@ -23,8 +23,8 @@ public class Poem_nde implements Xox_xnde {
int itm_bgn = xnde.Tag_open_end(), itm_end = xnde.Tag_close_bgn();
if (itm_bgn == src.length) return; // NOTE: handle inline where there is no content to parse; EX:
if (itm_bgn >= itm_end) return; // NOTE: handle inline where there is no content to parse; EX: ab
- if (src[itm_bgn] == Byte_ascii.NewLine) ++itm_bgn; // ignore 1st \n;
- if (src[itm_end - 1] == Byte_ascii.NewLine // ignore last \n;
+ if (src[itm_bgn] == Byte_ascii.Nl) ++itm_bgn; // ignore 1st \n;
+ if (src[itm_end - 1] == Byte_ascii.Nl // ignore last \n;
&& itm_end != itm_bgn) --itm_end; // ...if not same as 1st \n; EX: \n
Poem_xtn_mgr xtn_mgr = (Poem_xtn_mgr)wiki.Xtn_mgr().Get_or_fail(Poem_xtn_mgr.XTN_KEY);
byte[] poem_bry = Parse_lines(wiki.Utl__bfr_mkr(), src, itm_bgn, itm_end);
@@ -67,7 +67,7 @@ public class Poem_nde implements Xox_xnde {
break;
}
}
- int line_end = Bry_finder.Find_fwd(src, Byte_ascii.NewLine, line_bgn, src_end); // find end "\n"
+ int line_end = Bry_finder.Find_fwd(src, Byte_ascii.Nl, line_bgn, src_end); // find end "\n"
if (line_end == Bry_finder.Not_found) line_end = src_end; // no "\n"; use eos;
bfr.Add_mid(src, line_bgn, line_end); // add everything from line_bgn to line_end
if (indent_enabled) bfr.Add(Html_tag_.Span_rhs); // if "\n:", add ![\"\"](\"/wiki/File:A.png\")
" // NOTE: used to output class=\"image\"A.png
));
- fxt.Wtr_cfg().Lnki_title_(false);
+ fxt.Wtr_cfg().Lnki__title_(false);
}
@Test public void Img_embed() {
fxt.Test_parse_page_wiki_str("[[File:A.png|9x8px|alt=abc]]", Xop_fxt.html_img_none("File:A.png", "abc", "file:///mem/wiki/repo/trg/thumb/7/0/A.png/9px.png", "A.png"));
@@ -185,65 +185,65 @@ public class Xoh_file_wtr_basic_tst {
fxt.Init_para_n_();
}
@Test public void Img_title() {
- fxt.Wtr_cfg().Lnki_title_(true);
+ fxt.Wtr_cfg().Lnki__title_(true);
Tst_img_title("[[File:A.png|frameless|a b]]", "a b");
Tst_img_title("[[File:A.png|thumb|a b]]", "Enlarge"); // caption should not replace text
- fxt.Wtr_cfg().Lnki_title_(false);
+ fxt.Wtr_cfg().Lnki__title_(false);
}
@Test public void Title_escape() { // PURPOSE: escape quotes in title; PAGE:none; DATE:2014-10-27
- fxt.Wtr_cfg().Lnki_title_(true);
+ fxt.Wtr_cfg().Lnki__title_(true);
fxt.Test_parse_page_wiki_str("[[A\"B]]", "A\"B");
- fxt.Wtr_cfg().Lnki_title_(false);
+ fxt.Wtr_cfg().Lnki__title_(false);
}
@Test public void Img_title__caption_has_lnki() { // PURPOSE: caption with lnki should show in title; PAGE:en.w:Earth; DATE:2014-08-06
- fxt.Wtr_cfg().Lnki_title_(true);
+ fxt.Wtr_cfg().Lnki__title_(true);
Tst_img_title("[[File:A.png|frameless|[[A]]]]" , "A"); // ttl only
Tst_img_title("[[File:A.png|frameless|[[A|B]]]]" , "B"); // caption
Tst_img_title("[[File:A.png|frameless|[[A]]b]]" , "Ab"); // tail
- fxt.Wtr_cfg().Lnki_title_(false);
+ fxt.Wtr_cfg().Lnki__title_(false);
}
@Test public void Lnki_alt_is_text() { // PURPOSE: (a) alt should default to caption; (b) alt should not show html chars (like ![\"d](\"file:///mem/wiki/repo/trg/orig/7/0/A.png\")
+