sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix reading inline csv data and reading from an xml string when building with ptree/rapidxml - closes #1857 and closes #1856

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-22 09:13:05 -07:00
parent 40d262b2dd
commit 95d5b73d86
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/rapidxml_loader.cpp
View file

@ -79,8 +79,9 @@ public:
try
{
// Parse using appropriate flags
const int f_tws = rapidxml::parse_normalize_whitespace
| rapidxml::parse_trim_whitespace;
// https://github.com/mapnik/mapnik/issues/1856
// const int f_tws = rapidxml::parse_normalize_whitespace;
const int f_tws = rapidxml::parse_trim_whitespace;
rapidxml::xml_document<> doc;
doc.parse<f_tws>(&v.front());
@ -110,8 +111,10 @@ public:
// }
// }
load(buffer, node);
// https://github.com/mapnik/mapnik/issues/1857
std::stringstream s;
s << buffer;
load(s, node);
}
private:
void populate_tree(rapidxml::xml_node<char> *cur_node, xml_node &node)
@ -141,10 +144,7 @@ private:
case rapidxml::node_data:
case rapidxml::node_cdata:
{
std::string trimmed(cur_node->value());
mapnik::util::trim(trimmed);
if (trimmed.empty()) break; //Don't add empty text nodes
node.add_child(trimmed, 0, true);
node.add_child(cur_node->value(), 0, true);
}
break;
default: