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

'v3.4.3.1'

Browse Source
This commit is contained in:
gnosygnu
2016-04-17 23:47:45 -04:00
parent 14471ca656
commit ad140a93fe
102 changed files with 1278 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src/gplx/xowa/addons/apps/file_browsers/Fbrow_special_page.java
View File

@@ -39,7 +39,7 @@ public class Fbrow_special_page implements Xows_page {
// write head
Xopage_html_data rv = new Xopage_html_data(Display_ttl, body);
rv.Head_tags().Add(Xopg_tag_itm.New_css(addon_dir.GenSubFil_nest("bin", "file_browser.css")));
rv.Head_tags().Add(Xopg_tag_itm.New_css_file(addon_dir.GenSubFil_nest("bin", "file_browser.css")));
return rv;
}

2
400_xowa/src/gplx/xowa/addons/apps/file_browsers/Wikis_list_wtr.java
View File

@@ -42,7 +42,7 @@ class Wikis_list_wtr {
// write to html
Xopage_html_data rv = new Xopage_html_data(Wikis_list_page.Display_ttl, body);
rv.Head_tags().Add(Xopg_tag_itm.New_css(addon_dir.GenSubFil_nest("bin", "wiki_list.css")));
rv.Head_tags().Add(Xopg_tag_itm.New_css_file(addon_dir.GenSubFil_nest("bin", "wiki_list.css")));
return rv;
}
private static byte[] Get_root_url() {

3
400_xowa/src/gplx/xowa/addons/apps/file_browsers/Xopage_html_data.java
View File

@@ -30,9 +30,6 @@ public class Xopage_html_data {
public void Apply(Xoa_page page) {
page.Html_data().Html_restricted_n_();
page.Html_data().Skip_parse_(Bool_.Y);
Bry_bfr bfr = Bry_bfr.new_();
page.Html_data().Custom_head_end_concat(head_tags.To_html(bfr));
page.Html_data().Custom_html_end_concat(tail_tags.To_html(bfr));
page.Html_data().Display_ttl_(display_ttl);
page.Html_data().Custom_body_(this.Body());
page.Html_data().Custom_head_tags().Copy(head_tags);

11
400_xowa/src/gplx/xowa/addons/apps/searchs/bldrs/Srch_bldr_wkr.java
View File

@@ -16,20 +16,21 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.addons.apps.searchs.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.searchs.*;
import gplx.xowa.bldrs.*;
import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*;
public class Srch_bldr_wkr implements Xob_page_wkr {
private final Xowe_wiki wiki;
private final Srch_temp_tbl_wkr temp_tbl_wkr = new Srch_temp_tbl_wkr();
public Srch_bldr_wkr(Xob_bldr bldr, Xowe_wiki wiki) {this.wiki = wiki;}
public String Wkr_key() {return Xob_cmd_keys.Key_text_search_wkr;}
public void Wkr_bgn(Xob_bldr bldr) {
public String Page_wkr__key() {return Xob_cmd_keys.Key_text_search_wkr;}
public void Page_wkr__bgn() {
temp_tbl_wkr.Init(Bool_.N, wiki);
}
public void Wkr_run(gplx.xowa.wikis.data.tbls.Xowd_page_itm page) {
public void Page_wkr__run(gplx.xowa.wikis.data.tbls.Xowd_page_itm page) {
try {temp_tbl_wkr.Exec_by_wkr(page.Id(), page.Ttl_page_db());}
catch (Exception e) {Gfo_usr_dlg_.Instance.Warn_many("", "", "search:error: page=~{0} err=~{1}", page.Ttl_page_db(), Err_.Message_gplx_full(e));}
}
public void Wkr_end() {
public void Page_wkr__run_cleanup() {}
public void Page_wkr__end() {
temp_tbl_wkr.Term();
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {return this;}

4
400_xowa/src/gplx/xowa/addons/apps/searchs/bldrs/Srch_temp_tbl_wkr.java
View File

@@ -50,10 +50,10 @@ class Srch_temp_tbl_wkr implements Srch_text_parser_wkr {
Db_conn word_conn = search_temp_tbl.conn;
// update search_word ids if they exist
Srch_db_mgr.Optimize_unsafe_(word_conn, Bool_.Y);
// Srch_db_mgr.Optimize_unsafe_(word_conn, Bool_.Y); // NOTE: fails in multi-db due to transaction
Update_word_id(word_conn, wiki);
Search_word__insert(word_conn);
Srch_db_mgr.Optimize_unsafe_(word_conn, Bool_.N);
// Srch_db_mgr.Optimize_unsafe_(word_conn, Bool_.N);
// create search_link
Db_conn page_conn = wiki.Data__core_mgr().Tbl__page().conn;

8
400_xowa/src/gplx/xowa/addons/apps/searchs/dbs/Srch_temp_tbl.java
View File

@@ -39,10 +39,10 @@ public class Srch_temp_tbl {
}
public void Insert_end() {
conn.Txn_end();
stmt_insert = Db_stmt_.Rls(stmt_insert);
Srch_db_mgr.Optimize_unsafe_(conn, Bool_.Y);
conn.Meta_idx_create(Xoa_app_.Usr_dlg(), Dbmeta_idx_itm.new_unique_by_tbl(tbl_name, "word_text__word_id", fld_word_text, fld_word_id));
stmt_insert = Db_stmt_.Rls(stmt_insert);
// Srch_db_mgr.Optimize_unsafe_(conn, Bool_.Y); // NOTE: fails in multi-db due to transaction
conn.Meta_idx_create(Xoa_app_.Usr_dlg(), Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "word_text__word_id", fld_word_text, fld_word_id));
// conn.Meta_idx_create(Xoa_app_.Usr_dlg(), Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "page_id", fld_page_id));
Srch_db_mgr.Optimize_unsafe_(conn, Bool_.N);
// Srch_db_mgr.Optimize_unsafe_(conn, Bool_.N);
}
}