gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSXMLNode.m: Get final methods implemented on NSXMLNode

Browse source 
except for XPath/XQuery methods.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/nsxml_using_libxml2@34497 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2012-01-11 17:54:44 +00:00
parent c81e66eb31
commit 4dcda8401d
2 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-01-11 12:54-EST Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSXMLNode.m: Get final methods implemented on NSXMLNode
except for XPath/XQuery methods.
2012-01-10 20:21-EST Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSXMLDocument.m: Added forward declarations for private

72
Source/NSXMLNode.m
View file

@ -53,17 +53,15 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
stringValue: (NSString*)stringValue
{
NSXMLNode *n;
xmlNodePtr node;
xmlAttrPtr node;
n = [[[self alloc] initWithKind: NSXMLAttributeKind] autorelease];
[n setStringValue: stringValue];
[n setName: name];
node = xmlNewProp(NULL,
(xmlChar *)[name UTF8String],
(xmlChar *)[stringValue UTF8String]);
[n _setNode: node];
return n;
}
@ -73,28 +71,27 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
stringValue: (NSString*)stringValue
{
NSXMLNode *n;
xmlAttrPtr node = xmlNewProp(NULL,
XMLSTRING(name),
XMLSTRING(stringValue));
n = [[[self alloc] initWithKind: NSXMLAttributeKind] autorelease];
[n setURI: URI];
[n setStringValue: stringValue];
[n setName: name];
internal->node = xmlNewProp(NULL,
XMLSTRING(name),
XMLSTRING(stringValue));
[n _setNode: node];
return n;
}
+ (id) commentWithStringValue: (NSString*)stringValue
{
NSXMLNode *n;
xmlNodePtr node = xmlNewComment(XMLSTRING(stringValue));
n = [[[self alloc] initWithKind: NSXMLCommentKind] autorelease];
[n setStringValue: stringValue];
internal->node = xmlNewComment(XMLSTRING(stringValue));
[n _setNode: node];
return n;
}
@ -520,22 +517,15 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
- (NSXMLDocument*) rootDocument
{
NSXMLNode *ancestor = internal->parent;
/*
* Short-circuit evaluation gurantees that the nil-pointer is not
* dereferenced:
*/
while ((ancestor != nil)
&& (NSXMLDocumentKind != GSIVar(ancestor, kind)))
{
ancestor = GSIVar(ancestor, parent);
}
xmlNodePtr node = (xmlNodePtr)(internal->node);
NSXMLDocument *ancestor = (NSXMLDocument *)(node->doc->_private);
return (NSXMLDocument*)ancestor;
}
- (NSString*) stringValue
{
return internal->stringValue;
xmlNodePtr node = (xmlNodePtr)(internal->node);
return StringFromXMLString(node->content,strlen((char *)node->content));
}
- (NSString*) URI
@ -550,22 +540,21 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
- (NSString*) XMLStringWithOptions: (NSUInteger)options
{
NSMutableString *returnValue = [NSMutableString string];
NSXMLNodeKind kind = [self kind];
NSString *string = nil;
xmlNodePtr node = (xmlNodePtr)[self _node];
xmlChar *buf = NULL;
xmlDocPtr doc = node->doc;
xmlBufferPtr buffer = NULL;
int error = 0;
int len = 0;
if (kind == NSXMLAttributeKind)
{
[returnValue appendString: [self name]];
[returnValue appendString: @"=\""];
[returnValue appendString: [self stringValue]];
[returnValue appendString: @"\""];
}
else
{
// for all other types, do nothing for now...
}
error = xmlNodeDump(buffer, doc, node, 1, 1);
buf = buffer->content;
len = buffer->size;
string = StringFromXMLString(buf,len);
AUTORELEASE(string);
return returnValue;
return string;
}
- (void) setObjectValue: (id)value
@ -596,18 +585,19 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
- (void) setStringValue: (NSString*)string resolvingEntities: (BOOL)resolve
{
xmlNodePtr node = (xmlNodePtr)(internal->node);
if (resolve == NO)
{
ASSIGNCOPY(internal->stringValue, string);
node->content = (xmlChar *)[string UTF8String];
}
else
{
// need to actually resolve entities...
ASSIGNCOPY(internal->stringValue, string);
node->content = (xmlChar *)[string UTF8String];
}
if (nil == internal->stringValue)
{
internal->stringValue = @""; // string value may not be nil
node->content = (xmlChar *)[@"" UTF8String]; // string value may not be nil
}
}