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

v2.8.3.1

Browse Source
This commit is contained in:
gnosygnu
2015-08-17 02:09:16 -04:00
parent 34c34f227c
commit df10db140c
421 changed files with 4867 additions and 2429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataNde.java
View File

@@ -79,7 +79,7 @@ public class GfmlDataNde {
class GfmlDataWtr2 extends DataWtr_base implements DataWtr {
@Override public void WriteData(String name, Object val) {
GfmlTkn nameTkn = GfmlTkn_.raw_(name);
GfmlTkn valTkn = GfmlTkn_.raw_(XtoStr(val));
GfmlTkn valTkn = GfmlTkn_.raw_(To_str(val));
GfmlAtr atr = GfmlAtr.new_(nameTkn, valTkn, GfmlType_.String);
GfmlNde nde = gdoc.RootNde().SubHnds().Get_at(0);
nde.SubKeys().Add(atr);
@@ -91,8 +91,8 @@ class GfmlDataWtr2 extends DataWtr_base implements DataWtr {
@Override public void WriteNodeEnd() {}
public void WriteLeafEnd() {}
public void Clear() {}
public String XtoStr() {return "";}
String XtoStr(Object obj) {
public String To_str() {return "";}
String To_str(Object obj) {
if (obj == null) return "''";
String s = obj.toString();
return String_.Concat("'", String_.Replace(s, "'", "''"), "'");

2
110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataRdr.java
View File

@@ -35,7 +35,7 @@ public class GfmlDataRdr extends GfmlDataRdr_base {
rv.SetNode(nde);
return rv;
}
public static DataRdr wtr_(DataWtr wtr) {return raw_root_(wtr.XtoStr());}
public static DataRdr wtr_(DataWtr wtr) {return raw_root_(wtr.To_str());}
@Override public SrlMgr SrlMgr_new(Object o) {return new GfmlDataRdr();}
@gplx.Internal protected GfmlDataRdr() {
this.Parse_set(true);

2
110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataRdr_base.java
View File

@@ -54,7 +54,7 @@ public abstract class GfmlDataRdr_base extends DataRdr_base implements DataRdr {
return rv;
}
public void Rls() {}
public String XtoStr() {return curNde.XtoStr();}
public String To_str() {return curNde.To_str();}
@gplx.Internal protected void SetNode(GfmlNde curNde) {this.curNde = curNde; this.list = curNde.SubHnds();}
GfmlNde curNde; GfmlItmHnds list; int pos = -1;
}

6
110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java
View File

@@ -29,7 +29,7 @@ public class GfmlDataWtr extends DataWtr_base implements DataWtr {
if (nde.SubKeys().Count() != 0) AddTkn_nullVal(keyedSpr); // add keyedSprTkn if not first
GfmlTkn keyTkn = AddTkn_raw(name);
AddTkn_raw("=");
GfmlTkn valTkn = AddTkn_raw(XtoStr(val));
GfmlTkn valTkn = AddTkn_raw(To_str(val));
GfmlAtr atr = GfmlAtr.new_(keyTkn, valTkn, GfmlType_.String);
nde.SubObjs_Add(atr);
}
@@ -72,13 +72,13 @@ public class GfmlDataWtr extends DataWtr_base implements DataWtr {
public void Clear() {nde.SubObjs_Clear();}
public void WriteTableBgn(String name, GfoFldList fields) {}
public void CloseBranchHdr(boolean isInline) {}
public String XtoStr() {
public String To_str() {
while (stack.Count() > 0) { // auto-close all nodes
WriteNodeEnd();
}
return GfmlDocWtr_.xtoStr_(gdoc.RootNde());
}
String XtoStr(Object obj) {
String To_str(Object obj) {
if (obj == null) return "''";
String s = Object_.Xto_str_strict_or_empty(obj);
return String_.Concat("'", String_.Replace(s, "'", "''"), "'");

2
110_gfml/src_600_rdrWtr/gplx/gfml/SqlDoc.java
View File

@@ -83,7 +83,7 @@ class SqlCmd_quote_end implements GfmlBldrCmd {
sb.Add(pnd.Val());
}
//Int_.Xto_str(bldr.CurNdeFrame().Nde().SubTkns().length)
GfmlAtr atr = GfmlAtr.new_(GfmlTkn_.raw_("word"), GfmlTkn_.raw_(sb.XtoStr()), GfmlType_.String);
GfmlAtr atr = GfmlAtr.new_(GfmlTkn_.raw_("word"), GfmlTkn_.raw_(sb.To_str()), GfmlType_.String);
bldr.CurNdeFrame().CurNde().SubObjs_Add(atr);
bldr.Frames_end();
}