generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-20 05:49:04 +02:00
Code Issues Projects Releases Wiki Activity

XML: complete merge from 1.4.2

Browse Source
This commit is contained in:
Marian Krivos
2011-09-14 14:34:31 +00:00
parent 189695f9c3
commit 16ff8caf6b
59 changed files with 5219 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
XML/src/DOMParser.cpp
View File

@@ -46,15 +46,15 @@ namespace Poco {
namespace XML {
const XMLString DOMParser::FEATURE_WHITESPACE = toXMLString("http://www.appinf.com/features/no-whitespace-in-element-content");
const XMLString DOMParser::FEATURE_FILTER_WHITESPACE = toXMLString("http://www.appinf.com/features/no-whitespace-in-element-content");
DOMParser::DOMParser(NamePool* pNamePool):
_pNamePool(pNamePool),
_whitespace(true)
_pNamePool(pNamePool),
_filterWhitespace(false)
{
if (_pNamePool) _pNamePool->duplicate();
_saxParser.setFeature(XMLReader::FEATURE_NAMESPACES, true);
if (_pNamePool) _pNamePool->duplicate();
_saxParser.setFeature(XMLReader::FEATURE_NAMESPACES, true);
_saxParser.setFeature(XMLReader::FEATURE_NAMESPACE_PREFIXES, true);
}
@@ -85,51 +85,51 @@ void DOMParser::addEncoding(const XMLString& name, Poco::TextEncoding* pEncoding
void DOMParser::setFeature(const XMLString& name, bool state)
{
if (name == FEATURE_WHITESPACE)
_whitespace = state;
else
_saxParser.setFeature(name, state);
if (name == FEATURE_FILTER_WHITESPACE)
_filterWhitespace = state;
else
_saxParser.setFeature(name, state);
}
bool DOMParser::getFeature(const XMLString& name) const
{
if (name == FEATURE_WHITESPACE)
return _whitespace;
else
return _saxParser.getFeature(name);
if (name == FEATURE_FILTER_WHITESPACE)
return _filterWhitespace;
else
return _saxParser.getFeature(name);
}
Document* DOMParser::parse(const XMLString& uri)
{
if (_whitespace)
{
DOMBuilder builder(_saxParser, _pNamePool);
return builder.parse(uri);
}
else
{
WhitespaceFilter filter(&_saxParser);
DOMBuilder builder(filter, _pNamePool);
return builder.parse(uri);
}
if (_filterWhitespace)
{
WhitespaceFilter filter(&_saxParser);
DOMBuilder builder(filter, _pNamePool);
return builder.parse(uri);
}
else
{
DOMBuilder builder(_saxParser, _pNamePool);
return builder.parse(uri);
}
}
Document* DOMParser::parse(InputSource* pInputSource)
{
if (_whitespace)
{
DOMBuilder builder(_saxParser, _pNamePool);
return builder.parse(pInputSource);
}
else
{
WhitespaceFilter filter(&_saxParser);
DOMBuilder builder(filter, _pNamePool);
return builder.parse(pInputSource);
}
if (_filterWhitespace)
{
WhitespaceFilter filter(&_saxParser);
DOMBuilder builder(filter, _pNamePool);
return builder.parse(pInputSource);
}
else
{
DOMBuilder builder(_saxParser, _pNamePool);
return builder.parse(pInputSource);
}
}
@@ -141,17 +141,17 @@ Document* DOMParser::parseString(const std::string& xml)
Document* DOMParser::parseMemory(const char* xml, std::size_t size)
{
if (_whitespace)
{
DOMBuilder builder(_saxParser, _pNamePool);
return builder.parseMemoryNP(xml, size);
}
else
{
WhitespaceFilter filter(&_saxParser);
DOMBuilder builder(filter, _pNamePool);
return builder.parseMemoryNP(xml, size);
}
if (_filterWhitespace)
{
WhitespaceFilter filter(&_saxParser);
DOMBuilder builder(filter, _pNamePool);
return builder.parseMemoryNP(xml, size);
}
else
{
DOMBuilder builder(_saxParser, _pNamePool);
return builder.parseMemoryNP(xml, size);
}
}