gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-02 17:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSXMLElement.m: Implement namespace methods.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34808 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-02-23 00:01:27 +00:00
parent e01366b184
commit 2bd8c521dc
2 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-23 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLElement.m: Implement namespace methods.
2012-02-22 Fred Kiefer <FredKiefer@gmx.de> 2012-02-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLNode.m (-_nodeFollowingInNaturalDirection:): Correct * Source/NSXMLNode.m (-_nodeFollowingInNaturalDirection:): Correct

59
Source/NSXMLElement.m
View file

@ -296,7 +296,27 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (void) addNamespace: (NSXMLNode*)aNamespace - (void) addNamespace: (NSXMLNode*)aNamespace
{ {
[self notImplemented: _cmd]; xmlNsPtr ns = (xmlNsPtr)[aNamespace _node];
if (MY_NODE->ns == NULL)
{
MY_NODE->ns = ns;
}
else
{
xmlNsPtr cur = MY_NODE->ns;
const xmlChar *prefix = ns->prefix;
while (xmlStrcmp(prefix, cur->prefix) != 0)
{
if (cur->next == NULL)
{
cur->next = ns;
return;
}
cur = cur->next;
}
}
} }
- (void) removeNamespaceForPrefix: (NSString*)name - (void) removeNamespaceForPrefix: (NSString*)name
@ -307,13 +327,16 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (void) setNamespaces: (NSArray*)namespaces - (void) setNamespaces: (NSArray*)namespaces
{ {
NSEnumerator *en = [namespaces objectEnumerator]; NSEnumerator *en = [namespaces objectEnumerator];
NSString *namespace = nil; NSXMLNode *namespace = nil;
xmlNsPtr cur = NULL; xmlNsPtr cur = NULL;
while((namespace = (NSString *)[en nextObject]) != nil) // FIXME: Remove old namespaces
// xmlFreeNsList(MY_NODE->ns);
// MY_NODE->ns = NULL;
while ((namespace = (NSXMLNode *)[en nextObject]) != nil)
{ {
xmlNsPtr ns = xmlNewNs([self _node], NULL, XMLSTRING(namespace)); xmlNsPtr ns = (xmlNsPtr)[namespace _node];
if(MY_NODE->ns == NULL) if (MY_NODE->ns == NULL)
{ {
MY_NODE->ns = ns; MY_NODE->ns = ns;
cur = ns; cur = ns;
@ -337,7 +360,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
result = [NSMutableArray array]; result = [NSMutableArray array];
for (cur = ns; cur != NULL; cur = cur->next) for (cur = ns; cur != NULL; cur = cur->next)
{ {
[result addObject: StringFromXMLStringPtr(cur->prefix)]; [result addObject: [NSXMLNode _objectForNode: (xmlNodePtr)cur]];
} }
} }
@ -366,13 +389,33 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (NSXMLNode*) resolveNamespaceForName: (NSString*)name - (NSXMLNode*) resolveNamespaceForName: (NSString*)name
{ {
[self notImplemented: _cmd]; NSString *prefix = [[self class] prefixForName: name];
if (nil != prefix)
{
return [self namespaceForPrefix: prefix];
}
return nil; return nil;
} }
- (NSString*) resolvePrefixForNamespaceURI: (NSString*)namespaceURI - (NSString*) resolvePrefixForNamespaceURI: (NSString*)namespaceURI
{ {
[self notImplemented: _cmd]; xmlNsPtr ns = MY_NODE->ns;
if (ns)
{
const xmlChar *uri = XMLSTRING(namespaceURI);
xmlNsPtr cur = NULL;
for (cur = ns; cur != NULL; cur = cur->next)
{
if (xmlStrcmp(uri, cur->href) == 0)
{
return StringFromXMLStringPtr(cur->prefix);
}
}
}
return nil; return nil;
} }