Monotone-Parent: 5700ac30588b73b584a91318efc00fb0469e6c98

Monotone-Revision: 5db95c823716f08780a1e57b51f753d465c61194

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-18T20:26:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-06-18 20:26:32 +00:00
parent 38f77d80e4
commit a4f46a1205
2 changed files with 30 additions and 29 deletions

View File

@@ -25,16 +25,16 @@
#import <DOM/DOMNode.h>
@interface NGDOMNodeWithChildren (SOGoDOMExtensions)
@interface NGDOMNodeWithChildren (SOGoDOMExtensions) < DOMNode >
- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName;
- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace;
- (id<NSObject,DOMNode>) firstNodeWithTag: (NSString *) tagName;
- (id<NSObject,DOMNode>) firstNodeWithTag: (NSString *) tagName
- (id <DOMNodeList>) childElementsWithTag: (NSString *) tagName;
- (id <DOMNodeList>) childElementsWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace;
- (id <DOMElement>) firstElementWithTag: (NSString *) tagName;
- (id <DOMElement>) firstElementWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace;
@end
#endif /* S_GO_SOOBJECTS_SOGO_DOMNODE_SOGO_H */

View File

@@ -29,40 +29,41 @@
@implementation NGDOMNodeWithChildren (SOGo)
- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace
- (id <DOMNodeList>) childElementsWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace
{
id <DOMNodeList> nodes;
NSMutableArray <DOMNodeList> *childNodesWithTag;
id <NSObject, DOMNode> currentNode;
NSMutableArray <DOMNodeList> *childElementsWithTag;
id <DOMElement> currentElement;
unsigned int count, max;
childNodesWithTag = [NSMutableArray array];
childElementsWithTag = [NSMutableArray array];
nodes = [self childNodes];
max = [nodes length];
for (count = 0; count < max; count++)
{
currentNode = [nodes objectAtIndex: count];
if ([[currentNode nodeName] isEqualToString: tagName]
currentElement = [nodes objectAtIndex: count];
if ([currentElement nodeType] == DOM_ELEMENT_NODE
&& [[currentElement tagName] isEqualToString: tagName]
&& (!namespace
|| [[currentNode nodeName] isEqualToString: namespace]))
[childNodesWithTag addObject: currentNode];
|| [[currentElement namespaceURI] isEqualToString: namespace]))
[childElementsWithTag addObject: currentElement];
}
return childNodesWithTag;
return childElementsWithTag;
}
- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName
- (id <DOMNodeList>) childElementsWithTag: (NSString *) tagName
{
return [self childNodesWithTag: tagName inNamespace: nil];
return [self childElementsWithTag: tagName inNamespace: nil];
}
- (id <NSObject, DOMNode>) firstNodeWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace
- (id <DOMElement>) firstElementWithTag: (NSString *) tagName
inNamespace: (NSString *) namespace
{
id <DOMNodeList> nodes;
id <NSObject, DOMNode> node, currentNode;
id <DOMElement> node, currentElement;
unsigned int count, max;
node = nil;
@@ -71,20 +72,20 @@
max = [nodes length];
for (count = 0; !node && count < max; count++)
{
currentNode = [nodes objectAtIndex: count];
if ([[currentNode nodeName] isEqualToString: tagName]
currentElement = [nodes objectAtIndex: count];
if ([currentElement nodeType] == DOM_ELEMENT_NODE
&& [[currentElement tagName] isEqualToString: tagName]
&& (!namespace
|| [[currentNode nodeName] isEqualToString: namespace]))
node = currentNode;
|| [[currentElement namespaceURI] isEqualToString: namespace]))
node = currentElement;
}
return node;
}
- (id<NSObject,DOMNode>) firstNodeWithTag: (NSString *) tagName
- (id <DOMElement>) firstElementWithTag: (NSString *) tagName
{
return [self firstNodeWithTag: tagName inNamespace: nil];
return [self firstElementWithTag: tagName inNamespace: nil];
}
@end