Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arangoexport: refix xml attribute escaping

This commit is contained in:
baslr 2017-02-10 19:19:28 +01:00
parent 93b0a07fcb
commit aee918f964
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arangosh/Export/ExportFeature.cpp
View File

@ -31,15 +31,14 @@
#include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/GeneralClientConnection.h"
#include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h" #include "SimpleHttpClient/SimpleHttpResult.h"
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_tree_to_xml.hpp>
#include <boost/property_tree/detail/xml_parser_utils.hpp>
using namespace arangodb; using namespace arangodb;
using namespace arangodb::basics; using namespace arangodb::basics;
using namespace arangodb::httpclient; using namespace arangodb::httpclient;
using namespace arangodb::options; using namespace arangodb::options;
using namespace boost::spirit::classic; using namespace boost::property_tree::xml_parser;
ExportFeature::ExportFeature(application_features::ApplicationServer* server, ExportFeature::ExportFeature(application_features::ApplicationServer* server,
int* result) int* result)
@ -489,15 +488,15 @@ void ExportFeature::writeGraphBatch(int fd, VPackArrayIterator it, std::string c
for(auto const& doc : it) { for(auto const& doc : it) {
if (doc.hasKey("_from")) { if (doc.hasKey("_from")) {
xmlTag = "<edge label=\"" + xml::encode(doc.hasKey(_xgmmlLabelAttribute) && doc.get(_xgmmlLabelAttribute).isString() ? doc.get(_xgmmlLabelAttribute).copyString() : "Default-Label") + xmlTag = "<edge label=\"" + encode_char_entities(doc.hasKey(_xgmmlLabelAttribute) && doc.get(_xgmmlLabelAttribute).isString() ? doc.get(_xgmmlLabelAttribute).copyString() : "Default-Label") +
"\" source=\"" + xml::encode(doc.get("_from").copyString()) + "\" target=\"" + xml::encode(doc.get("_to").copyString()) + "\""; "\" source=\"" + encode_char_entities(doc.get("_from").copyString()) + "\" target=\"" + encode_char_entities(doc.get("_to").copyString()) + "\"";
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
if (!_xgmmlLabelOnly) { if (!_xgmmlLabelOnly) {
xmlTag = ">\n"; xmlTag = ">\n";
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
for (auto const& it : VPackObjectIterator(doc)) { for (auto const& it : VPackObjectIterator(doc)) {
xmlTag = xml::encode(it.key.copyString()); xmlTag = encode_char_entities(it.key.copyString());
xgmmlWriteOneAtt(fd, fileName, it.value, xmlTag); xgmmlWriteOneAtt(fd, fileName, it.value, xmlTag);
} }
@ -510,15 +509,15 @@ void ExportFeature::writeGraphBatch(int fd, VPackArrayIterator it, std::string c
} }
} else { } else {
xmlTag = "<node label=\"" + xml::encode(doc.hasKey(_xgmmlLabelAttribute) && doc.get(_xgmmlLabelAttribute).isString() ? doc.get(_xgmmlLabelAttribute).copyString() : "Default-Label") + xmlTag = "<node label=\"" + encode_char_entities(doc.hasKey(_xgmmlLabelAttribute) && doc.get(_xgmmlLabelAttribute).isString() ? doc.get(_xgmmlLabelAttribute).copyString() : "Default-Label") +
"\" id=\"" + xml::encode(doc.get("_id").copyString()) + "\""; "\" id=\"" + encode_char_entities(doc.get("_id").copyString()) + "\"";
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
if (!_xgmmlLabelOnly) { if (!_xgmmlLabelOnly) {
xmlTag = ">\n"; xmlTag = ">\n";
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
for (auto const& it : VPackObjectIterator(doc)) { for (auto const& it : VPackObjectIterator(doc)) {
xmlTag = xml::encode(it.key.copyString()); xmlTag = encode_char_entities(it.key.copyString());
xgmmlWriteOneAtt(fd, fileName, it.value, xmlTag); xgmmlWriteOneAtt(fd, fileName, it.value, xmlTag);
} }
@ -543,19 +542,19 @@ void ExportFeature::xgmmlWriteOneAtt(int fd, std::string const& fileName, VPackS
if (slice.isInteger()) { if (slice.isInteger()) {
type = "integer"; type = "integer";
value = "\"" + slice.toString() + "\""; value = slice.toString();
} else if (slice.isDouble()) { } else if (slice.isDouble()) {
type = "real"; type = "real";
value = "\"" + slice.toString() + "\""; value = slice.toString();
} else if (slice.isBool()) { } else if (slice.isBool()) {
type = "boolean"; type = "boolean";
value = "\"" + slice.toString() + "\""; value = slice.toString();
} else if (slice.isString()) { } else if (slice.isString()) {
type = "string"; type = "string";
value = slice.toString(); value = slice.copyString();
} else if (slice.isArray() || slice.isObject()) { } else if (slice.isArray() || slice.isObject()) {
if (0 < deep) { if (0 < deep) {
@ -567,13 +566,13 @@ void ExportFeature::xgmmlWriteOneAtt(int fd, std::string const& fileName, VPackS
} }
} else { } else {
xmlTag = " <att name=\"" + name + "\" type=\"string\" value=\"" + xml::encode(slice.toString()) + "\"/>\n"; xmlTag = " <att name=\"" + name + "\" type=\"string\" value=\"" + encode_char_entities(slice.toString()) + "\"/>\n";
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
return; return;
} }
if (!type.empty()) { if (!type.empty()) {
xmlTag = " <att name=\"" + name + "\" type=\"" + type + "\" value=" + xml::encode(value) + "/>\n"; xmlTag = " <att name=\"" + name + "\" type=\"" + type + "\" value=\"" + encode_char_entities(value) + "\"/>\n";
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
} else if (slice.isArray()) { } else if (slice.isArray()) {
@ -592,7 +591,7 @@ void ExportFeature::xgmmlWriteOneAtt(int fd, std::string const& fileName, VPackS
writeToFile(fd, xmlTag, fileName); writeToFile(fd, xmlTag, fileName);
for (auto const& it : VPackObjectIterator(slice)) { for (auto const& it : VPackObjectIterator(slice)) {
std::string name = xml::encode(it.key.copyString()); std::string name = encode_char_entities(it.key.copyString());
xgmmlWriteOneAtt(fd, fileName, it.value, name, deep + 1); xgmmlWriteOneAtt(fd, fileName, it.value, name, deep + 1);
} }