Fix parse

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@7481 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-09-12 10:56:20 +00:00
parent 1bfa5baeb9
commit afbe01a279

View file

@ -684,8 +684,9 @@ nodeToObject(GSXMLNode* node)
return nil; return nil;
} }
name = [node name]; name = [node name];
children = elementNode([node children]); children = [node children];
content = [children content]; content = [children content];
children = elementNode(children);
if ([name isEqualToString: @"string"]) if ([name isEqualToString: @"string"])
{ {
@ -727,7 +728,11 @@ nodeToObject(GSXMLNode* node)
while (children != nil) while (children != nil)
{ {
[container addObject: nodeToObject(children)]; id val;
val = nodeToObject(children);
NSLog(@"Array item %@", [children name], val);
[container addObject: val];
children = elementNode([children next]); children = elementNode([children next]);
} }
return container; return container;
@ -738,11 +743,16 @@ nodeToObject(GSXMLNode* node)
while (children != nil) while (children != nil)
{ {
NSString *key = nodeToObject(children); NSString *key;
id val;
key = nodeToObject(children);
NSLog(@"Key name (%@) %@", [children name], key);
children = elementNode([children next]); children = elementNode([children next]);
[container setObject: nodeToObject(children) forKey: key]; val = nodeToObject(children);
NSLog(@"Val name (%@) %@", [children name], val);
children = elementNode([children next]); children = elementNode([children next]);
[container setObject: val forKey: key];
} }
return container; return container;
} }