mirror of
https://github.com/gnustep/libs-base.git
synced 2025-06-01 09:02:01 +00:00
* Source/NSXMLNode.m (execute_xpath): Use correct node for
relative paths. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34821 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
c9ed32af80
commit
14330e67e1
2 changed files with 11 additions and 3 deletions
|
@ -582,11 +582,12 @@ int register_namespaces(xmlXPathContextPtr xpathCtx,
|
|||
return 0;
|
||||
}
|
||||
|
||||
NSArray *execute_xpath(NSXMLNode *node,
|
||||
NSArray *execute_xpath(NSXMLNode *xmlNode,
|
||||
NSString *xpath_exp,
|
||||
NSString *nmspaces)
|
||||
{
|
||||
xmlDocPtr doc = ((xmlNodePtr)[node _node])->doc;
|
||||
xmlNodePtr node = [xmlNode _node];
|
||||
xmlDocPtr doc = node->doc;
|
||||
NSMutableArray *result = [NSMutableArray arrayWithCapacity: 10];
|
||||
xmlChar* xpathExpr = (xmlChar *)XMLSTRING(xpath_exp);
|
||||
xmlChar* nsList = (xmlChar *)XMLSTRING(nmspaces);
|
||||
|
@ -615,7 +616,10 @@ NSArray *execute_xpath(NSXMLNode *node,
|
|||
}
|
||||
|
||||
if (![xpath_exp hasPrefix: @"/"])
|
||||
xpathCtx->node = (xmlNodePtr)doc; // provide a context for relative paths
|
||||
{
|
||||
// provide a context for relative paths
|
||||
xpathCtx->node = node;
|
||||
}
|
||||
|
||||
/* Evaluate xpath expression */
|
||||
xpathObj = xmlXPathEvalExpression(xpathExpr, xpathCtx);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue