Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-17 18:12:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

implemented nodeset version of key()

Browse source
This commit is contained in:
jez 2009-03-03 07:58:29 +00:00
parent 88150c062e
commit 9ddbb95491
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/XSLT/impl/xslt_functions.hpp
View file

@ -79,17 +79,30 @@ public:
virtual Arabica::XPath::XPathValue_impl<std::string>* evaluate(const DOM::Node<std::string>& context,
const Arabica::XPath::ExecutionContext<std::string>& executionContext) const
{
std::string keyname = argAsString(0, context, executionContext);
std::string keyClarkName = XML::QualifiedName<std::string>::parseQName(keyname, true, UriMapper(namespaces_)).clarkName();
Arabica::XPath::XPathValue<std::string> a1 = baseT::arg(1, context, executionContext);
if(a1.type() == Arabica::XPath::NODE_SET)
throw Arabica::XPath::UnsupportedException("node-set arg version of key()");
return nodeSetUnion(keyClarkName, a1.asNodeSet(), executionContext);
std::string keyname = argAsString(0, context, executionContext);
std::string id = a1.asString();
std::string clarkName = XML::QualifiedName<std::string>::parseQName(keyname, true, UriMapper(namespaces_)).clarkName();
return new Arabica::XPath::NodeSetValue<std::string>(keys_.lookup(clarkName, id, executionContext));
return new Arabica::XPath::NodeSetValue<std::string>(keys_.lookup(keyClarkName, a1.asString(), executionContext));
} // evaluate
Arabica::XPath::XPathValue_impl<std::string>* nodeSetUnion(const std::string& keyClarkName,
const Arabica::XPath::NodeSet<std::string> nodes,
const Arabica::XPath::ExecutionContext<std::string>& executionContext) const
{
Arabica::XPath::NodeSet<std::string> results;
for(Arabica::XPath::NodeSet<std::string>::const_iterator n = nodes.begin(), ne = nodes.end(); n != ne; ++n)
{
std::string id = Arabica::XPath::impl::nodeStringValue<std::string, Arabica::default_string_adaptor<std::string> >(*n);
results.push_back(keys_.lookup(keyClarkName, id, executionContext));
} // for ...
results.to_document_order();
return new Arabica::XPath::NodeSetValue<std::string>(results);
} // nodeSetUnion
private:
const DeclaredKeys& keys_;
std::map<std::string, std::string> namespaces_;

1
tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
View file

@ -21,7 +21,6 @@
<test-case id="extend_extend03" compiles="no"/>
<test-case id="extend_extend04" compiles="no"/>
<test-case id="impincl_impincl09" compiles="no"/>
<test-case id="impincl_impincl17" compiles="no"/>
<test-case id="lre_lre12" compiles="no" reason="Failing to compile is actually legitimate here. Saxon and MSXML agree, Xalan chooses to continue."/>
<test-case id="lre_lre13" compare="text" reason="Text out"/>
<test-case id="match_match01" compiles="no" reason="Needs xsl:strip-space"/>