diff --git a/400_xowa/src/gplx/xowa/langs/Xol_lang_itm_.java b/400_xowa/src/gplx/xowa/langs/Xol_lang_itm_.java index e884e7184..19424af8f 100644 --- a/400_xowa/src/gplx/xowa/langs/Xol_lang_itm_.java +++ b/400_xowa/src/gplx/xowa/langs/Xol_lang_itm_.java @@ -272,5 +272,6 @@ kwd_mgr.New(Bool_.Y, Xol_kwd_grp_.Id_pagebanner, "PAGEBANNER"); // NOTE: must be kwd_mgr.New(Bool_.Y, Xol_kwd_grp_.Id_rev_protectionexpiry, "PROTECTIONEXPIRY"); kwd_mgr.New(Bool_.N, Xol_kwd_grp_.Id_new_window_link, "#NewWindowLink"); kwd_mgr.New(Bool_.N, Xol_kwd_grp_.Id_categorytree, "#categorytree"); +kwd_mgr.New(Bool_.N, Xol_kwd_grp_.Id_assessment, "#assessment"); } } diff --git a/400_xowa/src/gplx/xowa/langs/kwds/Xol_kwd_grp_.java b/400_xowa/src/gplx/xowa/langs/kwds/Xol_kwd_grp_.java index 0c6770883..28e7fdb51 100644 --- a/400_xowa/src/gplx/xowa/langs/kwds/Xol_kwd_grp_.java +++ b/400_xowa/src/gplx/xowa/langs/kwds/Xol_kwd_grp_.java @@ -234,8 +234,9 @@ public static final int , Id_new_window_link = 212 , Id_categorytree = 213 , Id_lsth = 214 +, Id_assessment = 215 ; -public static final int Id__max = 215; +public static final int Id__max = 216; private static byte[] ary_itm_(int id) { switch (id) { @@ -454,6 +455,7 @@ case Xol_kwd_grp_.Id_pagebanner: return Bry_.new_u8("pagebanner"); case Xol_kwd_grp_.Id_rev_protectionexpiry: return Bry_.new_u8("protectionexpiry"); case Xol_kwd_grp_.Id_new_window_link: return Bry_.new_u8("newwindowlink"); case Xol_kwd_grp_.Id_categorytree: return Bry_.new_u8("categorytree"); +case Xol_kwd_grp_.Id_assessment: return Bry_.new_u8("assessment"); default: throw Err_.new_unhandled(id); } } diff --git a/400_xowa/src/gplx/xowa/xtns/assessments/Assessment_func.java b/400_xowa/src/gplx/xowa/xtns/assessments/Assessment_func.java new file mode 100644 index 000000000..9c550e0f9 --- /dev/null +++ b/400_xowa/src/gplx/xowa/xtns/assessments/Assessment_func.java @@ -0,0 +1,29 @@ +/* +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.xtns.assessments; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +import gplx.xowa.xtns.pfuncs.*; +import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; +import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*; +import gplx.xowa.htmls.core.htmls.utls.*; +public class Assessment_func extends Pf_func_base { + @Override public int Id() {return Xol_kwd_grp_.Id_assessment;} + @Override public Pf_func New(int id, byte[] name) {return new Assessment_func().Name_(name);} + @Override public void Func_evaluate(Bry_bfr bfr, Xop_ctx ctx, Xot_invk caller, Xot_invk self, byte[] src) { + } + public static final Assessment_func Instance = new Assessment_func(); Assessment_func() {} +} diff --git a/400_xowa/src/gplx/xowa/xtns/assessments/Assessment_func__tst.java b/400_xowa/src/gplx/xowa/xtns/assessments/Assessment_func__tst.java new file mode 100644 index 000000000..c2988ae7a --- /dev/null +++ b/400_xowa/src/gplx/xowa/xtns/assessments/Assessment_func__tst.java @@ -0,0 +1,25 @@ +/* +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.xtns.assessments; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +import org.junit.*; +public class Assessment_func__tst { + @Before public void init() {fxt.Reset();} private final Xop_fxt fxt = new Xop_fxt(); + @Test public void Basic() { + fxt.Test__parse__tmpl_to_html("{{#assessment:Name|A|Hi}}", ""); + } +} diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java index 4c143069a..6097a698b 100644 --- a/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java +++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java @@ -244,6 +244,7 @@ public class Pf_func_ { , Xol_kwd_grp_.Id_pagebanner , Xol_kwd_grp_.Id_rev_protectionexpiry , Xol_kwd_grp_.Id_categorytree + , Xol_kwd_grp_.Id_assessment }; public static Xot_defn Get_prototype(int id) { switch (id) { @@ -422,6 +423,7 @@ public class Pf_func_ { case Xol_kwd_grp_.Id_cascadingSources: return new Pf_func_noop(id); case Xol_kwd_grp_.Id_bang: return Pf_func_bang.Instance; + case Xol_kwd_grp_.Id_assessment: return gplx.xowa.xtns.assessments.Assessment_func.Instance; default: throw Err_.new_unhandled(id); } } diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor_.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor_.java index bbfdd904a..81bbe46f7 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor_.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor_.java @@ -45,7 +45,6 @@ public class Wdata_prop_val_visitor_ { return rv; } private static void Render_snak(Bry_bfr bfr, Xowe_wiki wiki, Xol_lang_itm lang, byte[] page_url, Keyval[] props, int sub_idx, int sub_len) { - // [snaktype=value, property=P1082, datavalue=[Lgplx.Keyval;@44a11b76, datatype=quantity] // loop props to get (a) snaktype; (b) property; (c) datavalue byte snak_tid = Byte_.Max_value_127; int pid = -1;