Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions KissXML/DDXMLNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ enum {
#pragma mark --- XPath/XQuery ---

- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error;

// This is an extension over NSXMLNode.
// It is required if you are using XPath with documents with default namespaces.
- (NSArray *)nodesForXPath:(NSString *)xpath namespaceMappings:(NSDictionary*)namespaceMappings error:(NSError **)error;

//- (NSArray *)objectsForXQuery:(NSString *)xquery constants:(NSDictionary *)constants error:(NSError **)error;
//- (NSArray *)objectsForXQuery:(NSString *)xquery error:(NSError **)error;

Expand Down
34 changes: 26 additions & 8 deletions KissXML/DDXMLNode.m
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,11 @@ - (NSString *)XMLStringWithOptions:(NSUInteger)options
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error
{
return [self nodesForXPath:xpath namespaceMappings:nil error:error];
}

- (NSArray *)nodesForXPath:(NSString *)xpath namespaceMappings:namespaceMappings error:(NSError **)error
{
#if DDXML_DEBUG_MEMORY_ISSUES
DDXMLNotZombieAssert();
Expand Down Expand Up @@ -1230,15 +1235,28 @@ - (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error
xpathCtx = xmlXPathNewContext(doc);
xpathCtx->node = (xmlNodePtr)genericPtr;

xmlNodePtr rootNode = (doc)->children;
if(rootNode != NULL)
{
xmlNsPtr ns = rootNode->nsDef;
while(ns != NULL)
if (namespaceMappings) {
for (NSString* k in namespaceMappings) {
NSString* v = [namespaceMappings objectForKey:k];
xmlXPathRegisterNs(xpathCtx, [k xmlChar], [v xmlChar]);
}
}
else {
xmlNodePtr rootNode = doc->children;
if(rootNode != NULL)
{
xmlXPathRegisterNs(xpathCtx, ns->prefix, ns->href);

ns = ns->next;
xmlNsPtr ns = rootNode->nsDef;
while(ns != NULL)
{
const xmlChar* prefix = ns->prefix;
if (!prefix || !*prefix)
{
prefix = rootNode->name;
}
xmlXPathRegisterNs(xpathCtx, prefix, ns->href);

ns = ns->next;
}
}
}

Expand Down