Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 232623, support nodeID, patch by sharekk@hotmail.com, r=axel@pike.org, sr=shaver

Browse Source
This commit is contained in:
axel%pike.org 2006-03-07 15:43:26 +00:00
parent dcd6678c11
commit 561ca826c2
1 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
rdf/base/src/nsRDFContentSink.cpp
View File

@ -72,6 +72,7 @@
*/
#include "nsCOMPtr.h"
#include "nsInterfaceHashtable.h"
#include "nsIContentSink.h"
#include "nsIRDFContainer.h"
#include "nsIRDFContainerUtils.h"
@ -186,6 +187,7 @@ public:
static nsIAtom* kAboutAtom;
static nsIAtom* kIdAtom;
static nsIAtom* kNodeIdAtom;
static nsIAtom* kAboutEachAtom;
static nsIAtom* kResourceAtom;
static nsIAtom* kRDFAtom;
@ -253,6 +255,9 @@ protected:
// The datasource in which we're assigning assertions
nsCOMPtr<nsIRDFDataSource> mDataSource;
// A hash of all the node IDs referred to
nsInterfaceHashtable<nsStringHashKey, nsIRDFResource> mNodeIDMap;
// The current state of the content sink
RDFContentSinkState mState;
RDFContentSinkParseMode mParseMode;
@ -287,6 +292,7 @@ nsIRDFResource* RDFContentSinkImpl::kRDF_nextVal;
nsIAtom* RDFContentSinkImpl::kAboutAtom;
nsIAtom* RDFContentSinkImpl::kIdAtom;
nsIAtom* RDFContentSinkImpl::kNodeIdAtom;
nsIAtom* RDFContentSinkImpl::kAboutEachAtom;
nsIAtom* RDFContentSinkImpl::kResourceAtom;
nsIAtom* RDFContentSinkImpl::kRDFAtom;
@ -302,6 +308,7 @@ nsIAtom* RDFContentSinkImpl::kParseTypeAtom;
static const nsStaticAtom rdf_atoms[] = {
{ "about", &RDFContentSinkImpl::kAboutAtom },
{ "ID", &RDFContentSinkImpl::kIdAtom },
{ "nodeID", &RDFContentSinkImpl::kNodeIdAtom },
{ "aboutEach", &RDFContentSinkImpl::kAboutEachAtom },
{ "resource", &RDFContentSinkImpl::kResourceAtom },
{ "RDF", &RDFContentSinkImpl::kRDFAtom },
@ -348,6 +355,8 @@ RDFContentSinkImpl::RDFContentSinkImpl()
NS_RegisterStaticAtoms(rdf_atoms, NS_ARRAY_LENGTH(rdf_atoms));
}
mNodeIDMap.Init();
#ifdef PR_LOGGING
if (! gLog)
gLog = PR_NewLogModule("nsRDFContentSink");
@ -843,6 +852,8 @@ RDFContentSinkImpl::GetIdAboutAttribute(const PRUnichar** aAttributes,
// This corresponds to the dirty work of production [6.5]
nsresult rv;
nsAutoString nodeID;
nsCOMPtr<nsIAtom> localName;
for (; *aAttributes; aAttributes += 2) {
const nsDependentSubstring& nameSpaceURI =
@ -895,6 +906,9 @@ RDFContentSinkImpl::GetIdAboutAttribute(const PRUnichar** aAttributes,
return gRDFService->GetResource(name, aResource);
}
else if (localName == kNodeIdAtom) {
nodeID.Assign(aAttributes[1]);
}
else if (localName == kAboutEachAtom) {
// XXX we don't deal with aboutEach...
//PR_LOG(gLog, PR_LOG_WARNING,
@ -907,7 +921,20 @@ RDFContentSinkImpl::GetIdAboutAttribute(const PRUnichar** aAttributes,
if (aIsAnonymous)
*aIsAnonymous = PR_TRUE;
rv = gRDFService->GetAnonymousResource(aResource);
// If nodeID is present, check if we already know about it. If we've seen
// the nodeID before, use the same resource, otherwise generate a new one.
if (!nodeID.IsEmpty()) {
mNodeIDMap.Get(nodeID,aResource);
if (!*aResource) {
rv = gRDFService->GetAnonymousResource(aResource);
mNodeIDMap.Put(nodeID,*aResource);
}
}
else {
rv = gRDFService->GetAnonymousResource(aResource);
}
return rv;
}
@ -916,6 +943,9 @@ RDFContentSinkImpl::GetResourceAttribute(const PRUnichar** aAttributes,
nsIRDFResource** aResource)
{
nsCOMPtr<nsIAtom> localName;
nsAutoString nodeID;
for (; *aAttributes; aAttributes += 2) {
const nsDependentSubstring& nameSpaceURI =
SplitExpatName(aAttributes[0], getter_AddRefs(localName));
@ -948,7 +978,23 @@ RDFContentSinkImpl::GetResourceAttribute(const PRUnichar** aAttributes,
return gRDFService->GetResource(NS_ConvertUTF16toUTF8(aAttributes[1]),
aResource);
}
else if (localName == kNodeIdAtom) {
nodeID.Assign(aAttributes[1]);
}
}
// If nodeID is present, check if we already know about it. If we've seen
// the nodeID before, use the same resource, otherwise generate a new one.
if (!nodeID.IsEmpty()) {
mNodeIDMap.Get(nodeID,aResource);
if (!*aResource) {
mNodeIDMap.Put(nodeID,*aResource);
return gRDFService->GetAnonymousResource(aResource);
}
return NS_OK;
}
return NS_ERROR_FAILURE;
}
@ -970,11 +1016,11 @@ RDFContentSinkImpl::AddProperties(const PRUnichar** aAttributes,
continue;
}
// skip `about', `ID', and `resource' attributes (either with or
// skip `about', `ID', `resource', and 'nodeID' attributes (either with or
// without the `rdf:' prefix); these are all "special" and
// should've been dealt with by the caller.
if (localName == kAboutAtom || localName == kIdAtom ||
localName == kResourceAtom) {
localName == kResourceAtom || localName == kNodeIdAtom) {
if (nameSpaceURI.IsEmpty() ||
nameSpaceURI.EqualsLiteral(RDF_NAMESPACE_URI))
continue;