Fix for 299931 and an attempt to fix 124173

This commit is contained in:
guha 1998-07-09 02:19:37 +00:00
parent b808d771e0
commit 6c53758a35
3 changed files with 15 additions and 14 deletions

View File

@ -79,20 +79,17 @@ getTranslator (char* url)
ans = MakeSCookDB(url);
} else if (startsWith("rdf:CookieStore", url)) {
ans = MakeCookieStore(url);
return MakeCookieStore(url);
} else if (startsWith("rdf:find", url)) {
return MakeFindStore(url);
ans = MakeFindStore(url);
}
#endif
if (ans) {
PL_HashTableAdd(dataSourceHash, url, ans);
return ans;
} else if (startsWith("http://", url)) {
ans = MakeFileDB(url);
return(ans);
} else
return NULL;
else if (startsWith("http://", url)) {
ans = MakeFileDB(url);
} else {
ans = NULL;
}
if (ans) PL_HashTableAdd(dataSourceHash, ans->url, ans);
return ans;
}
@ -1092,6 +1089,10 @@ void
sendNotifications2 (RDFT r, RDF_EventType opType, RDF_Resource u, RDF_Resource s, void* v, RDF_ValueType type, PRBool tv)
{
RDFL rl = r->rdf;
if ((opType == RDF_ASSERT_NOTIFY) &&
(nlocalStoreHasAssertion(gLocalStore, u, s, v, type, !tv))) {
return;
}
while (rl) {
sendNotifications(rl->rdf, opType, u, s, v, type, tv, r->url);
rl = rl->next;

View File

@ -240,7 +240,7 @@ addSlotValue (RDFFile f, RDF_Resource u, RDF_Resource s, void* v,
}
if ((s == gCoreVocab->RDF_parent) && (type == RDF_RESOURCE_TYPE)) {
f->genlAdded = true;
if (strstr(resourceID(u), ".rdf")) {
if (strstr(resourceID(u), ".rdf") && startsWith("http", resourceID(u))) {
RDFL rl = f->db->rdf;
char* dburl = getBaseURL(resourceID(u));
if (!startsWith(dburl, resourceID((RDF_Resource)v))) {

View File

@ -75,12 +75,12 @@ parseNextRDFXMLBlob (NET_StreamClass *stream, char* blob, int32 size)
char c = blob[n];
m = 0;
somethingseenp = 0;
memset(f->line, '\0', RDF_BUF_SIZE);
memset(f->line, '\0', RDF_BUF_SIZE-1);
if (f->holdOver[0] != '\0') {
memcpy(f->line, f->holdOver, strlen(f->holdOver));
m = strlen(f->holdOver);
somethingseenp = 1;
memset(f->holdOver, '\0', RDF_BUF_SIZE);
memset(f->holdOver, '\0', RDF_BUF_SIZE-1);
}
while ((n < size) && (wsc(c))) {c = blob[++n];}
/* f->line[m++] = c;