From 2bd8c521dc85c4be2b047205d67acdcf51c20431 Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 23 Feb 2012 00:01:27 +0000
Subject: [PATCH] * Source/NSXMLElement.m: Implement namespace methods.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34808 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog             |  4 +++
 Source/NSXMLElement.m | 59 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 318590f6c..c3aa8fadb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* Source/NSXMLNode.m (-_nodeFollowingInNaturalDirection:): Correct
diff --git a/Source/NSXMLElement.m b/Source/NSXMLElement.m
index e338b7f48..6b5035945 100644
--- a/Source/NSXMLElement.m
+++ b/Source/NSXMLElement.m
@@ -296,7 +296,27 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
 
 - (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
@@ -307,13 +327,16 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
 - (void) setNamespaces: (NSArray*)namespaces
 {
   NSEnumerator *en = [namespaces objectEnumerator];
-  NSString *namespace = nil;
+  NSXMLNode *namespace = nil;
   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));
-      if(MY_NODE->ns == NULL)
+      xmlNsPtr ns = (xmlNsPtr)[namespace _node];
+      if (MY_NODE->ns == NULL)
 	{
 	  MY_NODE->ns = ns;
 	  cur = ns;
@@ -337,7 +360,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
       result = [NSMutableArray array];
       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
 {
-  [self notImplemented: _cmd];
+  NSString *prefix = [[self class] prefixForName: name];
+
+  if (nil != prefix)
+    {
+      return [self namespaceForPrefix: prefix];
+    }
+
   return nil;
 }
 
 - (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;
 }