Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Missing Content issue with HTML. Now all elements with tagName == ... #12

Merged
merged 1 commit into from
Apr 11, 2012
Merged

Fixed Missing Content issue with HTML. Now all elements with tagName == ... #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions XPathQuery.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#import <libxml/xpath.h>
#import <libxml/xpathInternals.h>

NSDictionary *DictionaryForNode(xmlNodePtr currentNode, NSMutableDictionary *parentResult);
NSDictionary *DictionaryForNode(xmlNodePtr currentNode, NSMutableDictionary *parentResult,BOOL parentContent);
NSArray *PerformXPathQuery(xmlDocPtr doc, NSString *query);

NSDictionary *DictionaryForNode(xmlNodePtr currentNode, NSMutableDictionary *parentResult)
NSDictionary *DictionaryForNode(xmlNodePtr currentNode, NSMutableDictionary *parentResult,BOOL parentContent)
{
NSMutableDictionary *resultForNode = [NSMutableDictionary dictionary];

Expand All @@ -35,15 +35,21 @@

if ([[resultForNode objectForKey:@"nodeName"] isEqual:@"text"] && parentResult)
{
[parentResult
setObject:
[currentNodeContent
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]
forKey:@"nodeContent"];
return nil;
if(parentContent)
{
[parentResult setObject:[currentNodeContent stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] forKey:@"nodeContent"];
return nil;
}
[resultForNode setObject:currentNodeContent forKey:@"nodeContent"];
// NSLog(@"content: %@",currentNodeContent);
return resultForNode;

}
else {
[resultForNode setObject:currentNodeContent forKey:@"nodeContent"];
}


[resultForNode setObject:currentNodeContent forKey:@"nodeContent"];
}

xmlAttr *attribute = currentNode->properties;
Expand All @@ -57,12 +63,13 @@
[NSString stringWithCString:(const char *)attribute->name encoding:NSUTF8StringEncoding];
if (attributeName)
{
// NSLog(@"Attribute Name Set: %@",attributeName);
[attributeDictionary setObject:attributeName forKey:@"attributeName"];
}

if (attribute->children)
{
NSDictionary *childDictionary = DictionaryForNode(attribute->children, attributeDictionary);
NSDictionary *childDictionary = DictionaryForNode(attribute->children, attributeDictionary,true);
if (childDictionary)
{
[attributeDictionary setObject:childDictionary forKey:@"attributeContent"];
Expand All @@ -88,7 +95,7 @@
NSMutableArray *childContentArray = [NSMutableArray array];
while (childNode)
{
NSDictionary *childDictionary = DictionaryForNode(childNode, resultForNode);
NSDictionary *childDictionary = DictionaryForNode(childNode, resultForNode,false);
if (childDictionary)
{
[childContentArray addObject:childDictionary];
Expand Down Expand Up @@ -137,7 +144,7 @@
NSMutableArray *resultNodes = [NSMutableArray array];
for (NSInteger i = 0; i < nodes->nodeNr; i++)
{
NSDictionary *nodeDictionary = DictionaryForNode(nodes->nodeTab[i], nil);
NSDictionary *nodeDictionary = DictionaryForNode(nodes->nodeTab[i], nil,false);
if (nodeDictionary)
{
[resultNodes addObject:nodeDictionary];
Expand Down