Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 230099: don't serialize RDF literals inline if they contain newlines.

Browse Source 
r=rjc, sr=bz-vacation


git-svn-id: svn://10.0.0.236/trunk@151340 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tingley%sundell.net 2004-01-15 01:17:25 +00:00
parent d8c1f4c4c0
commit b596007c47
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/rdf/base/src/nsRDFXMLSerializer.cpp
View File

@ -465,7 +465,10 @@ nsRDFXMLSerializer::SerializeProperty(nsIOutputStream* aStream,
if (! assertions)
return NS_ERROR_FAILURE;
PRBool multi = PR_FALSE;
// Serializing the assertion inline is ok as long as the property has
// only one target value, and it is a literal that doesn't include line
// breaks.
PRBool needsChild = PR_FALSE;
while (1) {
PRBool hasMore = PR_FALSE;
@ -475,18 +478,30 @@ nsRDFXMLSerializer::SerializeProperty(nsIOutputStream* aStream,
nsCOMPtr<nsISupports> isupports;
assertions->GetNext(getter_AddRefs(isupports));
nsCOMPtr<nsIRDFLiteral> literal = do_QueryInterface(isupports);
needsChild |= (!literal);
if (! multi) {
assertions->HasMoreElements(&hasMore);
if (hasMore)
multi = PR_TRUE;
if (!needsChild) {
assertions->HasMoreElements(&needsChild);
if (!needsChild) {
const PRUnichar* literalVal = nsnull;
literal->GetValueConst(&literalVal);
if (literalVal) {
for (; *literalVal; literalVal++) {
if (*literalVal == PRUnichar('\n') ||
*literalVal == PRUnichar('\r')) {
needsChild = PR_TRUE;
break;
}
}
}
}
}
nsCOMPtr<nsIRDFLiteral> literal = do_QueryInterface(isupports);
if (aInline && (literal && !multi)) {
if (aInline && !needsChild) {
rv = SerializeInlineAssertion(aStream, aResource, aProperty, literal);
}
else if (!aInline && (!literal || multi)) {
else if (!aInline && needsChild) {
nsCOMPtr<nsIRDFNode> value = do_QueryInterface(isupports);
rv = SerializeChildAssertion(aStream, aResource, aProperty, value);
}