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

* Source/NSXMLPrivate.h: Remvoe unused ivars.

Browse source 
* Source/NSXMLDocument.m: Get DTD from node and and validation
in init methods.
* Source/NSXMLDTD.m: Implement.
* Source/NSXMLNode.m: No children for attribute nodes.
* Tests/base/NSXMLNode/basic.m: Test empty attribute children


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34943 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-03-17 13:57:58 +00:00
parent e91304036b
commit fbccdda56f
6 changed files with 255 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Source/NSXMLDocument.m
View file

@ -49,7 +49,6 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
{
if (GS_EXISTS_INTERNAL)
{
[internal->docType release];
[internal->MIMEType release];
}
[super dealloc];
@ -70,7 +69,8 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
- (NSXMLDTD*) DTD
{
return internal->docType;
xmlDtdPtr dtd = xmlGetIntSubset(internal->node);
return (NSXMLDTD *)[NSXMLNode _objectForNode: (xmlNodePtr)dtd];
}
- (void) _createInternal
@ -139,10 +139,19 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
code: 0
userInfo: nil];
}
return nil;
}
// FIXME: Free old node
// Free old node
xmlFreeDoc((xmlDocPtr)internal->node);
[self _setNode: doc];
if (mask & NSXMLDocumentValidate)
{
[self validateAndReturnError: error];
}
}
return self;
}
@ -221,10 +230,16 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
- (void) setDTD: (NSXMLDTD*)documentTypeDeclaration
{
NSXMLDTD *old;
NSAssert(documentTypeDeclaration != nil, NSInvalidArgumentException);
// FIXME: do node house keeping, remove ivar, use intSubset
ASSIGNCOPY(internal->docType, documentTypeDeclaration);
internal->node->extSubset = [documentTypeDeclaration _node];
// detach the old DTD, this also removes the corresponding child
old = [self DTD];
[old detach];
internal->node->intSubset = (xmlDtdPtr)[documentTypeDeclaration _node];
[self addChild: documentTypeDeclaration];
}
- (void) setMIMEType: (NSString*)MIMEType
@ -300,7 +315,7 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
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
@ -387,14 +402,16 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
while ((key = [en nextObject]) != nil)
{
params[index] = (xmlChar *)XMLSTRING(key);
params[index+1] = (xmlChar *)XMLSTRING([arguments objectForKey: key]);
params[index + 1] = (xmlChar *)XMLSTRING([arguments objectForKey: key]);
index += 2;
}
params[index] = NULL;
params[index + 1] = NULL;
}
// Apply the stylesheet and get the result...
resultDoc
= xsltApplyStylesheet(stylesheet, internal->node, (const char **)params);
resultDoc = xsltApplyStylesheet(stylesheet, internal->node,
(const char **)params);
// Cleanup...
xsltFreeStylesheet(stylesheet);
@ -446,8 +463,8 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
NSXMLDocument *c = (NSXMLDocument*)[super copyWithZone: zone];
[c setMIMEType: [self MIMEType]];
// the extSubset isnt copied by libxml2
[c setDTD: [self DTD]];
// the intSubset is copied by libxml2
//[c setDTD: [self DTD]];
[c setDocumentContentKind: [self documentContentKind]];
return c;
}