More Sitemap related fixes

modules/rdf/include/vocab.h

@@ -23,6 +23,9 @@ typedef struct _RDF_CoreVocabStruct {
   RDF_Resource RDF_parent;
   RDF_Resource RDF_name;
   RDF_Resource RDF_instanceOf;
+  RDF_Resource RDF_subClassOf;
+  RDF_Resource RDF_PropertyType;
+  RDF_Resource RDF_Class;
   RDF_Resource RDF_slotsHere;
   RDF_Resource RDF_slotsIn;
   RDF_Resource RDF_domain;
@@ -36,12 +39,10 @@ typedef struct _RDF_CoreVocabStruct {
   RDF_Resource RDF_greaterThanOrEqual;
   RDF_Resource RDF_stringEquals;
   RDF_Resource RDF_substring;
-  RDF_Resource RDF_notParent; 
-  RDF_Resource RDF_notInstanceOf; 
-  RDF_Resource RDF_notEquals; 
-  RDF_Resource RDF_notStringEquals; 
-  RDF_Resource RDF_notSubstring;
   RDF_Resource RDF_child;
+  RDF_Resource RDF_comment;
+  RDF_Resource RDF_content;
+  RDF_Resource RDF_summary;
 } RDF_CoreVocabStruct;
 
 typedef RDF_CoreVocabStruct* RDF_CoreVocab;

modules/rdf/src/ht.c

@@ -6778,7 +6778,7 @@ HT_AddSitemapFor(HT_Pane htPane, char *pUrl, char *pSitemapUrl, char* name)
         nsmp->origin =  FROM_PAGE;
         nsmp->onDisplayp = 1;
 	SCookAssert3(sp, nu, gCoreVocab->RDF_name, nm,  RDF_STRING_TYPE, 1);
-	SCookAssert3(sp, nu, gCoreVocab->RDF_parent, gNavCenter->RDF_Sitemaps, 
+	SCookAssert3(sp, nu, gCoreVocab->RDF_parent, gNavCenter->RDF_Top, 
                      RDF_RESOURCE_TYPE, 1);
 	 
 
@@ -6807,11 +6807,11 @@ RetainOldSitemaps (HT_Pane htPane, char *pUrl)
             SCookAssert3(sp, nu, gCoreVocab->RDF_name, copyString(nsmp->name),  
                          RDF_STRING_TYPE, 1);
             SCookAssert3(sp, nu, gCoreVocab->RDF_parent, 
-                         gNavCenter->RDF_Sitemaps, RDF_RESOURCE_TYPE, 1);
+                         gNavCenter->RDF_Top, RDF_RESOURCE_TYPE, 1);
           }
         } else if (nsmp->onDisplayp) {
           SCookUnassert(sp, nsmp->sitemap, gCoreVocab->RDF_parent,
-                        gNavCenter->RDF_Sitemaps, RDF_RESOURCE_TYPE);
+                        gNavCenter->RDF_Top, RDF_RESOURCE_TYPE);
           nsmp->onDisplayp = 0;
         }
     }

modules/rdf/src/rdf-int.h

@@ -137,6 +137,7 @@ struct RDF_AssertionStruct {
   uint8 tags;
   struct RDF_AssertionStruct* next;
   struct RDF_AssertionStruct* invNext;
+  struct RDF_TranslatorStruct* db;
 } ;
 
 

modules/rdf/src/vocab.c

@@ -71,6 +71,9 @@ createCoreVocab ()
   gCoreVocab->RDF_parent = RDF_GetResource(gCoreDB, "parent", 1);
   gCoreVocab->RDF_name = RDF_GetResource(gCoreDB, "name", 1);
   gCoreVocab->RDF_instanceOf = RDF_GetResource(gCoreDB, "instanceOf", 1);
+  gCoreVocab->RDF_subClassOf = RDF_GetResource(gCoreDB, "subClassOf", 1);
+  gCoreVocab->RDF_Class = RDF_GetResource(gCoreDB, "Class", 1);
+  gCoreVocab->RDF_PropertyType = RDF_GetResource(gCoreDB, "PropertyType", 1);
   gCoreVocab->RDF_slotsHere = RDF_GetResource(gCoreDB, "slotsHere", 1);
   gCoreVocab->RDF_slotsIn = RDF_GetResource(gCoreDB, "slotsIn", 1);
   gCoreVocab->RDF_domain = RDF_GetResource(gCoreDB, "domain", 1);
@@ -84,12 +87,11 @@ createCoreVocab ()
   gCoreVocab->RDF_greaterThanOrEqual = RDF_GetResource(gCoreDB, "greaterThanOrEqualTo", 1);
   gCoreVocab->RDF_stringEquals = RDF_GetResource(gCoreDB, "stringEquals", 1);
   gCoreVocab->RDF_substring = RDF_GetResource(gCoreDB, "substring", 1);
-  gCoreVocab->RDF_notParent = RDF_GetResource(gCoreDB, "notParent", 1); 
-  gCoreVocab->RDF_notInstanceOf = RDF_GetResource(gCoreDB, "notInstanceOf", 1); 
-  gCoreVocab->RDF_notEquals = RDF_GetResource(gCoreDB, "notEquals", 1); 
-  gCoreVocab->RDF_notStringEquals = RDF_GetResource(gCoreDB, "notStringEquals", 1); 
-  gCoreVocab->RDF_notSubstring = RDF_GetResource(gCoreDB, "notSubstring", 1); 
   gCoreVocab->RDF_child = RDF_GetResource(gCoreDB, "child", 1);
+  gCoreVocab->RDF_content = RDF_GetResource(gCoreDB, "content", 1);
+  gCoreVocab->RDF_summary = RDF_GetResource(gCoreDB, "summary", 1);
+  gCoreVocab->RDF_comment = RDF_GetResource(gCoreDB, "comment", 1);
+  
 }