github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-15 22:02:51 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: AsXML now with Stream variant, AsXMLFile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6648 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-12-12 08:23:27 +00:00
parent 6b3006a342
commit 9a2ad5451b
4 changed files with 109 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

79
uppsrc/Core/XML.cpp
View file

@ -949,6 +949,7 @@ bool ShouldPreserve(const String& s)
return false;
}
/*
String AsXML(const XmlNode& node, dword style)
{
StringBuffer r;
@ -995,6 +996,84 @@ String AsXML(const XmlNode& node, dword style)
}
return r;
}
*/
static void sAsXML(Stream& out, const XmlNode& node, dword style, const String& indent)
{
if(style & XML_HEADER) {
String h = XmlHeader();
if(!(style & XML_PRETTY))
h.Trim(h.GetCount() - 2);
out << h;
}
if(style & XML_DOCTYPE)
for(int i = 0; i < node.GetCount(); i++) {
const XmlNode& m = node.Node(i);
if(m.GetType() == XML_TAG) {
String h = XmlDocType(m.GetText());
h.Trim(h.GetCount() - 2);
out << h;
break;
}
}
style &= ~(XML_HEADER|XML_DOCTYPE);
switch(node.GetType()) {
case XML_PI:
out << indent << "<?" << node.GetText() << "?>\r\n";
break;
case XML_DECL:
out << indent << "<!" << node.GetText() << ">\r\n";
break;
case XML_COMMENT:
out << indent << "<!--" << node.GetText() << "-->\r\n";
break;
case XML_DOC:
for(int i = 0; i < node.GetCount(); i++)
sAsXML(out, node.Node(i), style, indent);
break;
case XML_TEXT:
out << DeXml(node.GetText());
break;
case XML_TAG:
XmlTag tag(node.GetText());
for(int i = 0; i < node.GetAttrCount(); i++)
tag(node.AttrId(i), node.Attr(i));
if(node.GetCount()) {
out << indent << tag.GetBegin();
String indent2 = (style & XML_PRETTY) && node[0].IsTag() && node[node.GetCount() - 1].IsTag() ?
indent + '\t' : String();
for(int i = 0; i < node.GetCount(); i++)
sAsXML(out, node.Node(i), style, indent2);
if(indent2.GetCount())
out << indent;
out << tag.GetEnd();
}
else
out << indent << tag();
}
}
void AsXML(Stream& out, const XmlNode& n, dword style)
{
sAsXML(out, n, style, style & XML_PRETTY ? "\r\n" : "");
}
String AsXML(const XmlNode& n, dword style)
{
StringStream ss;
AsXML(ss, n, style);
return ss.GetResult();
}
bool AsXMLFile(const char *path, const XmlNode& n, dword style)
{
FileOut out(path);
if(!out)
return false;
AsXML(out, n, style);
out.Close();
return !out.IsError();
}
bool IgnoreXmlPaths::DoTag(const String& id)
{

8
uppsrc/Core/XML.h
View file

@ -23,6 +23,9 @@ public:
String Text(const String& s, byte charset = CHARSET_DEFAULT) { return Text(~s, charset); }
String PreservedText(const char *s, byte charset = CHARSET_DEFAULT);
String PreservedText(const String& s, byte charset = CHARSET_DEFAULT) { return PreservedText(~s, charset); }
String GetBegin() const { return tag + '>'; }
String GetEnd() const { return end; }
XmlTag& operator()(const char *attr, const char *val);
XmlTag& operator()(const char *attr, int q);
@ -250,6 +253,9 @@ public:
enum {
XML_HEADER = 0x01,
XML_DOCTYPE = 0x02,
XML_PRETTY = 0x04,
};
String AsXML(const XmlNode& n, dword style = XML_HEADER|XML_DOCTYPE);
void AsXML(Stream& out, const XmlNode& n, dword style = XML_HEADER|XML_DOCTYPE|XML_PRETTY);
String AsXML(const XmlNode& n, dword style = XML_HEADER|XML_DOCTYPE|XML_PRETTY);
bool AsXMLFile(const char *path, const XmlNode& n, dword style = XML_HEADER|XML_DOCTYPE|XML_PRETTY);

28
uppsrc/Core/src.tpp/XmlNode$en-us.tpp
View file

@ -228,7 +228,7 @@ is destroyed in operation).&]
[s0; &]
[s0; &]
[s0; &]
[ {{10000@(113.42.0) [s0;%% [*@7;4 XmlNode `- parser and output functions]]}}&]
[ {{10000@(113.42.0) [s0;%% [*@7;4 XmlNode `- parse and output functions]]}}&]
[s4;H0; &]
[s5;:ParseXML`(XmlParser`&`,dword`): [_^XmlNode^ XmlNode]_[* ParseXML]([_^XmlParser^ XmlPar
ser][@(0.0.255) `&]_[*@3 p], [_^dword^ dword]_[*@3 style]_`=_XML`_IGNORE`_DECLS[@(0.0.255) `|
@ -275,17 +275,33 @@ ilter class] to exclude some parts of XML, usually to preserve
memory.&]
[s3;%% &]
[s4; &]
[s5;:AsXML`(Stream`&`,const XmlNode`&`,dword`): [@(0.0.255) void]_[* AsXML]([_^Stream^ Stre
am][@(0.0.255) `&]_[*@3 out], [@(0.0.255) const]_[_^XmlNode^ XmlNode][@(0.0.255) `&]_[*@3 n],
[_^dword^ dword]_[*@3 style]_`=_XML`_HEADER[@(0.0.255) `|]XML`_DOCTYPE[@(0.0.255) `|]XML
`_PRETTY)&]
[s5;:AsXML`(const XmlNode`&`,dword`): [_^String^ String]_[* AsXML]([@(0.0.255) const]_[_^XmlNode^ X
mlNode][@(0.0.255) `&]_[*@3 n], [_^dword^ dword]_[*@3 style]_`=_XML`_HEADER[@(0.0.255) `|]X
ML`_DOCTYPE)&]
ML`_DOCTYPE[@(0.0.255) `|]XML`_PRETTY)&]
[s5;:AsXMLFile`(const char`*`,const XmlNode`&`,dword`): [@(0.0.255) bool]_[* AsXMLFile]([@(0.0.255) c
onst]_[@(0.0.255) char]_`*[*@3 path], [@(0.0.255) const]_[_^XmlNode^ XmlNode][@(0.0.255) `&
]_[*@3 n], [_^dword^ dword]_[*@3 style]_`=_XML`_HEADER[@(0.0.255) `|]XML`_DOCTYPE[@(0.0.255) `|
]XML`_PRETTY)&]
[s0; &]
[s2;%% Creates a XML document from XmlNode [%-*@3 n]. [%-*@3 style] can
be a combination &]
be a combination of&]
[s2;%% &]
[ {{3581:6419<288;^ [s2;l32; XML`_HEADER]
::= [s2;l64;%% Adds standard XML header at the beginning of the document.]
::^ [s2;l32; XML`_DOCTYPE]
::= [s2;l64;%% Adds DOCTYPE declaration at the beginning of the document
with type taken as id of first XML`_TAG sub`-node (which represents
the root element).]}}&]
[s3;%% &]
[s0; ]]
the root element).]
::^ [s2;l32; XML`_PRETTY]
::= [s2;l64;%% XML document is formatted as multiline document with nice
indentation. If not active, everything is in sigle line with
no identantion.]}}&]
[s2; &]
[s2; Output is stored to Stream, returned as String or (with AsXMLFile)
stored to file. AsXMLFile returns true if output file was successfully
created.&]
[s2; ]]

2
uppsrc/Core/src.tpp/XmlParser$en-us.tpp
View file

@ -221,6 +221,6 @@ does not make copy of the text).&]
[s4; &]
[s5;:XmlParser`:`:XmlParser`(Stream`&`): [* XmlParser]([_^Stream^ Stream][@(0.0.255) `&]_[*@3 i
n])&]
[s2;%% Creates the parser for xml input stream [%-*@3 in].&]
[s2;%% Creates the parser for the input stream [%-*@3 in].&]
[s3;%% &]
[s0; ]]