External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XPath: Fixed all_in_namespace node test

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@213 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2009-11-08 10:15:07 +00:00
parent f22d0647a2
commit 7defdcdd04
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pugixpath.cpp
View File

@ -1498,7 +1498,7 @@ namespace pugi
break; break;
case nodetest_all_in_namespace: case nodetest_all_in_namespace:
if (!strncmp(a.name(), m_contents, strlen(m_contents)) && a.name()[strlen(m_contents)] == ':') if (!strncmp(a.name(), m_contents, strlen(m_contents)))
ns.push_back(xpath_node(a, parent)); ns.push_back(xpath_node(a, parent));
break; break;
@ -1547,8 +1547,7 @@ namespace pugi
break; break;
case nodetest_all_in_namespace: case nodetest_all_in_namespace:
if (n.type() == node_element && !strncmp(n.name(), m_contents, strlen(m_contents)) && if (n.type() == node_element && !strncmp(n.name(), m_contents, strlen(m_contents)))
n.name()[strlen(m_contents)] == ':')
ns.push_back(n); ns.push_back(n);
break; break;
@ -3279,7 +3278,7 @@ namespace pugi
if (nt_name.size() > 2 && colon_pos == nt_name.size() - 2 && nt_name[nt_name.size() - 1] == '*') // NCName:* if (nt_name.size() > 2 && colon_pos == nt_name.size() - 2 && nt_name[nt_name.size() - 1] == '*') // NCName:*
{ {
nt_name.erase(nt_name.size() - 1); nt_name.erase(nt_name.size() - 1); // erase *
nt_type = nodetest_all_in_namespace; nt_type = nodetest_all_in_namespace;
} }