diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-03-11 14:45:38 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-03-11 14:45:38 (GMT) |
| commit | c34e0ce034586a05308e552cbbdff48beec7dd96 (patch) | |
| tree | 39c73ba64b0d228b3c53913ea4e7ab6dda6ad5c1 /src/uscxml/DOMUtils.cpp | |
| parent | ca46aa711fb5d08a8fd1cc6b91593c281189e8e3 (diff) | |
| download | uscxml-c34e0ce034586a05308e552cbbdff48beec7dd96.zip uscxml-c34e0ce034586a05308e552cbbdff48beec7dd96.tar.gz uscxml-c34e0ce034586a05308e552cbbdff48beec7dd96.tar.bz2 | |
Integrated debugger into browser (use -d command line parameter)
Diffstat (limited to 'src/uscxml/DOMUtils.cpp')
| -rw-r--r-- | src/uscxml/DOMUtils.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/uscxml/DOMUtils.cpp b/src/uscxml/DOMUtils.cpp index c38b087..3cf986b 100644 --- a/src/uscxml/DOMUtils.cpp +++ b/src/uscxml/DOMUtils.cpp @@ -25,9 +25,14 @@ namespace uscxml { -std::string DOMUtils::xPathForNode(const Arabica::DOM::Node<std::string>& node) { +std::string DOMUtils::xPathForNode(const Arabica::DOM::Node<std::string>& node, const std::string& ns) { std::string xPath; - + std::string nsPrefix; + + if (ns.size() > 0) { + nsPrefix = ns + ":"; + } + if (!node || node.getNodeType() != Arabica::DOM::Node_base::ELEMENT_NODE) return xPath; @@ -37,12 +42,16 @@ std::string DOMUtils::xPathForNode(const Arabica::DOM::Node<std::string>& node) case Arabica::DOM::Node_base::ELEMENT_NODE: { if (HAS_ATTR(curr, "id")) { // we assume ids to be unique and return immediately - xPath.insert(0, "//" + TAGNAME(curr) + "[@id=\"" + ATTR(curr, "id") + "\"]"); + if (ns == "*") { + xPath.insert(0, "//*[local-name() = \"" + TAGNAME(curr) + "\"][@id=\"" + ATTR(curr, "id") + "\"]"); + } else { + xPath.insert(0, "//" + nsPrefix + TAGNAME(curr) + "[@id=\"" + ATTR(curr, "id") + "\"]"); + } return xPath; } else { // check previous siblings to count our index Arabica::DOM::Node<std::string> sibling = curr.getPreviousSibling(); - int index = 1; + int index = 1; // xpath indices start at 1 while(sibling) { if (sibling.getNodeType() == Arabica::DOM::Node_base::ELEMENT_NODE) { if (iequals(TAGNAME(sibling), TAGNAME(curr))) { @@ -51,7 +60,11 @@ std::string DOMUtils::xPathForNode(const Arabica::DOM::Node<std::string>& node) } sibling = sibling.getPreviousSibling(); } - xPath.insert(0, "/" + TAGNAME(curr) + "[" + toStr(index) + "]"); + if (ns == "*") { + xPath.insert(0, "/*[local-name() = \"" + TAGNAME(curr) + "\"][" + toStr(index) + "]"); + } else { + xPath.insert(0, "/" + nsPrefix + TAGNAME(curr) + "[" + toStr(index) + "]"); + } } break; } |