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

Merge from trunk.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/nsxml_using_libxml2@34831 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2012-02-27 19:07:14 +00:00
parent 47c4d708fc
commit ef4da2c593
4 changed files with 838 additions and 775 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/NSXMLDTDNode.m
View file

@ -60,6 +60,9 @@ GS_PRIVATE_INTERNAL(NSXMLDTDNode)
- (id) initWithXMLString: (NSString*)string
{
// internal->node = xmlNewDtd(NULL,NULL,NULL);
// TODO: Parse the string and get the info to create this...
[self notImplemented: _cmd];
return nil;
}

191
Source/NSXMLDocument.m
View file

@ -60,7 +60,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
+ (Class) replacementClassForClass: (Class)cls
{
return Nil;
return cls;
}
- (void) dealloc
@ -119,16 +119,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
options: (NSUInteger)mask
error: (NSError**)error
{
NSString *string = nil;
// Check for nil data and throw an exception
if (![data isKindOfClass: [NSData class]])
{
DESTROY(self);
[NSException raise: NSInvalidArgumentException
format: @"[NSXMLDocument-%@] non data argument",
NSStringFromSelector(_cmd)];
}
if (nil == data)
{
DESTROY(self);
@ -136,12 +127,41 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
format: @"[NSXMLDocument-%@] nil argument",
NSStringFromSelector(_cmd)];
}
if (![data isKindOfClass: [NSData class]])
{
DESTROY(self);
[NSException raise: NSInvalidArgumentException
format: @"[NSXMLDocument-%@] non data argument",
NSStringFromSelector(_cmd)];
}
// Initialize the string...
string = [[NSString alloc] initWithData: data
encoding: NSUTF8StringEncoding];
AUTORELEASE(string);
return [self initWithXMLString:string options:mask error:error];
if ((self = [self initWithKind: NSXMLDocumentKind options: 0]) != nil)
{
char *url = NULL;
char *encoding = NULL; // "UTF8";
int options = XML_PARSE_NOERROR;
xmlDocPtr doc = NULL;
if (!(mask & NSXMLNodePreserveWhitespace))
{
options |= XML_PARSE_NOBLANKS;
//xmlKeepBlanksDefault(0);
}
doc = xmlReadMemory([data bytes], [data length],
url, encoding, options);
if (doc == NULL)
{
DESTROY(self);
if (error != NULL)
{
*error = [NSError errorWithDomain: @"NSXMLErrorDomain"
code: 0
userInfo: nil];
}
}
[self _setNode: doc];
}
return self;
}
- (id) initWithKind: (NSXMLNodeKind)kind options: (NSUInteger)theOptions
@ -160,13 +180,6 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (id) initWithRootElement: (NSXMLElement*)element
{
if ([element parent] != nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"%@ cannot be used as root of %@",
element,
self];
}
self = [self initWithKind: NSXMLDocumentKind options: 0];
if (self != nil)
{
@ -179,42 +192,23 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
options: (NSUInteger)mask
error: (NSError**)error
{
if (nil == string)
{
DESTROY(self);
[NSException raise: NSInvalidArgumentException
format: @"[NSXMLDocument-%@] nil argument",
NSStringFromSelector(_cmd)];
}
if (NO == [string isKindOfClass: [NSString class]])
{
DESTROY(self);
if (nil == string)
{
[NSException raise: NSInvalidArgumentException
format: @"[NSXMLDocument-%@] nil argument",
NSStringFromSelector(_cmd)];
}
[NSException raise: NSInvalidArgumentException
format: @"[NSXMLDocument-%@] invalid argument",
NSStringFromSelector(_cmd)];
NSStringFromSelector(_cmd)];
}
if ((self = [self initWithKind: NSXMLDocumentKind options: 0]) != nil)
{
const char *str = [string UTF8String];
char *url = NULL;
char *encoding = NULL; // "UTF8";
int options = XML_PARSE_NOERROR;
xmlDocPtr doc = NULL;
if (!(mask & NSXMLNodePreserveWhitespace))
options |= XML_PARSE_NOBLANKS;
//xmlKeepBlanksDefault(0);
doc = xmlReadDoc((xmlChar *)str, url, encoding, options);
if(doc == NULL)
{
[self release];
self = nil;
if (error != NULL)
*error = [NSError errorWithDomain:@"NSXMLErrorDomain" code:0 userInfo:nil];
//[NSException raise:NSInvalidArgumentException
// format:@"Cannot instantiate NSXMLDocument with invalid data"];
}
[self _setNode:doc];
}
return self;
return [self initWithData: [string dataUsingEncoding: NSUTF8StringEncoding]
options: mask
error: error];
}
- (BOOL) isStandalone
@ -230,7 +224,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (NSXMLElement*) rootElement
{
xmlNodePtr rootElem = xmlDocGetRootElement(MY_DOC);
return (NSXMLElement *)[NSXMLNode _objectForNode:rootElem];
return (NSXMLElement *)[NSXMLNode _objectForNode: rootElem];
}
- (void) setCharacterEncoding: (NSString*)encoding
@ -259,16 +253,23 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
{
id oldElement = [self rootElement];
if(root == nil)
if (root == nil)
{
return;
}
if ([root parent] != nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"%@ cannot be used as root of %@",
root,
self];
}
xmlDocSetRootElement(MY_DOC,[root _node]);
xmlDocSetRootElement(MY_DOC, [root _node]);
// Do our subNode housekeeping...
[self _removeSubNode:oldElement];
[self _addSubNode:root];
[self _removeSubNode: oldElement];
[self _addSubNode: root];
}
- (void) setStandalone: (BOOL)standalone
@ -332,34 +333,28 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (void) removeChildAtIndex: (NSUInteger)index
{
NSXMLNode *child;
xmlNodePtr n;
NSXMLNode *child;
if (index >= [self childCount])
{
[NSException raise: NSRangeException
format: @"index too large"];
format: @"index too large"];
}
child = [[self children] objectAtIndex: index];
n = [child _node];
xmlUnlinkNode(n);
child = [self childAtIndex: index];
[child detach];
}
- (void) setChildren: (NSArray*)children
{
NSEnumerator *en;
NSXMLNode *child;
while ([self childCount] > 0)
NSUInteger count = [self childCount];
while (count-- > 0)
{
[self removeChildAtIndex: [self childCount] - 1];
}
en = [[self children] objectEnumerator];
while ((child = [en nextObject]) != nil)
{
[self insertChild: child atIndex: [self childCount]];
[self removeChildAtIndex: count];
}
[self insertChildren: children atIndex: 0];
}
- (void) addChild: (NSXMLNode*)child
@ -407,30 +402,31 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
error: (NSError**)error
{
#ifdef HAVE_LIBXSLT
xmlChar *data = (xmlChar *)[xslt bytes];
xmlChar **params = NULL;
xmlDocPtr stylesheetDoc = xmlReadDoc(data, NULL, NULL, XML_PARSE_NOERROR);
xmlDocPtr stylesheetDoc = xmlReadMemory([xslt bytes], [xslt length],
NULL, NULL, XML_PARSE_NOERROR);
xsltStylesheetPtr stylesheet = xsltParseStylesheetDoc(stylesheetDoc);
xmlDocPtr resultDoc = NULL;
NSEnumerator *en = [arguments keyEnumerator];
NSString *key = nil;
NSUInteger index = 0;
// Iterate over the keys and put them into params...
if(arguments != nil)
if (arguments != nil)
{
NSEnumerator *en = [arguments keyEnumerator];
NSString *key = nil;
NSUInteger index = 0;
int count = [[arguments allKeys] count];
*params = NSZoneCalloc([self zone],((count + 1) * 2),sizeof(xmlChar *));
while((key = [en nextObject]) != nil)
*params = NSZoneCalloc([self zone], ((count + 1) * 2), sizeof(xmlChar *));
while ((key = [en nextObject]) != nil)
{
params[index] = (xmlChar *)XMLSTRING(key);
params[index+1] = (xmlChar *)XMLSTRING([arguments objectForKey: key]);
index+=2;
index += 2;
}
}
// Apply the stylesheet and get the result...
resultDoc = xsltApplyStylesheet(stylesheet,MY_DOC,(const char **)params);
resultDoc = xsltApplyStylesheet(stylesheet, MY_DOC, (const char **)params);
// Cleanup...
xsltFreeStylesheet(stylesheet);
@ -449,38 +445,31 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
arguments: (NSDictionary*)arguments
error: (NSError**)error
{
#ifdef HAVE_LIBXSLT
NSData *data = [[NSData alloc] initWithBytes: [xslt UTF8String]
length: [xslt length]];
NSXMLDocument *result = [self objectByApplyingXSLT: data
arguments: arguments
error: error];
[data release];
NSData *data = [xslt dataUsingEncoding: NSUTF8StringEncoding];
NSXMLDocument *result = [self objectByApplyingXSLT: data
arguments: arguments
error: error];
return result;
#else
return nil;
#endif
}
- (id) objectByApplyingXSLTAtURL: (NSURL*)xsltURL
arguments: (NSDictionary*)arguments
error: (NSError**)error
{
#ifdef HAVE_LIBXSLT
NSData *data = [NSData dataWithContentsOfURL: xsltURL];
NSXMLDocument *result = [self objectByApplyingXSLT: data
arguments: arguments
error: error];
NSXMLDocument *result = [self objectByApplyingXSLT: data
arguments: arguments
error: error];
return result;
#else
return nil;
#endif
}
- (BOOL) validateAndReturnError: (NSError**)error
{
xmlValidCtxtPtr ctxt = xmlNewValidCtxt();
// FIXME: Should use xmlValidityErrorFunc and userData
// to get the error
BOOL result = (BOOL)(xmlValidateDocument(ctxt, MY_DOC));
xmlFreeValidCtxt(ctxt);
return result;
}
@ -491,7 +480,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (BOOL) isEqual: (id)other
{
if(self == other)
if (self == other)
{
return YES;
}

142
Source/NSXMLElement.m
View file

@ -110,7 +110,11 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
{
if ([self initWithName: name URI: nil] != nil)
{
[self setObjectValue: string];
NSXMLNode *t;
t = [[NSXMLNode alloc] initWithKind: NSXMLTextKind];
[t setStringValue: string];
[self addChild: t];
[t release];
}
return nil;
}
@ -119,19 +123,17 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
error: (NSError**)error
{
NSXMLElement *result = nil;
if((self = [super init]) != nil)
NSXMLDocument *tempDoc =
[[NSXMLDocument alloc] initWithXMLString: string
options: 0
error: error];
if (tempDoc != nil)
{
NSXMLDocument *tempDoc =
[[NSXMLDocument alloc] initWithXMLString:string
options:0
error:error];
if(tempDoc != nil)
{
result = RETAIN([tempDoc rootElement]);
[result detach]; // detach from document.
}
[tempDoc release];
result = RETAIN([tempDoc rootElement]);
[result detach]; // detach from document.
}
[tempDoc release];
return result;
}
@ -143,7 +145,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
for (cur = MY_NODE->children; cur != NULL; cur = cur->next)
{
NSString *n = StringFromXMLStringPtr(cur->name);
if([n isEqualToString: name])
if ([n isEqualToString: name])
{
NSXMLNode *node = (NSXMLNode *)(cur->_private);
[results addObject: node];
@ -294,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
@ -305,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;
@ -326,38 +351,73 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (NSArray*) namespaces
{
// FIXME: Should use xmlGetNsList()
NSMutableArray *result = nil;
xmlNsPtr ns = MY_NODE->ns;
if(ns)
if (ns)
{
xmlNsPtr cur = NULL;
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]];
}
}
// [self notImplemented: _cmd];
return result; // nil; // internal->namespaces;
return result;
}
- (NSXMLNode*) namespaceForPrefix: (NSString*)name
{
[self notImplemented: _cmd];
// FIXME: Should use xmlSearchNs()
xmlNsPtr ns = MY_NODE->ns;
if (ns)
{
const xmlChar *prefix = XMLSTRING(name);
xmlNsPtr cur = NULL;
for (cur = ns; cur != NULL; cur = cur->next)
{
if (xmlStrcmp(prefix, cur->prefix) == 0)
{
return [NSXMLNode _objectForNode: (xmlNodePtr)cur];
}
}
}
return nil;
}
- (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];
// FIXME Should use xmlSearchNsByHref()
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;
}
@ -379,7 +439,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
NSAssert(NSXMLNamespaceKind != kind, NSInvalidArgumentException);
NSAssert(NSXMLNotationDeclarationKind != kind, NSInvalidArgumentException);
[self _insertChild:child atIndex:index];
[self _insertChild: child atIndex: index];
}
- (void) insertChildren: (NSArray*)children atIndex: (NSUInteger)index
@ -395,41 +455,33 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (void) removeChildAtIndex: (NSUInteger)index
{
NSXMLNode *child;
xmlNodePtr n;
NSXMLNode *child;
if (index >= [self childCount])
{
[NSException raise: NSRangeException
format: @"index too large"];
format: @"index too large"];
}
child = [[self children] objectAtIndex: index];
n = [child _node];
xmlUnlinkNode(n);
[self _removeSubNode:child];
child = [self childAtIndex: index];
[child detach];
}
- (void) setChildren: (NSArray*)children
{
NSEnumerator *en;
NSXMLNode *child;
NSUInteger count = [self childCount];
while ([self childCount] > 0)
while (count-- > 0)
{
[self removeChildAtIndex: [self childCount] - 1];
}
en = [[self children] objectEnumerator];
while ((child = [en nextObject]) != nil)
{
[self insertChild: child atIndex: [self childCount]];
[self removeChildAtIndex: count];
}
[self insertChildren: children atIndex: 0];
}
- (void) addChild: (NSXMLNode*)child
{
int count = [self childCount];
[self insertChild: child atIndex: count];
[self insertChild: child atIndex: [self childCount]];
}
- (void) replaceChildAtIndex: (NSUInteger)index withNode: (NSXMLNode*)node

1277
Source/NSXMLNode.m
View file

File diff suppressed because it is too large Load diff