Changeset: 2656b0e42a82 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2656b0e42a82
Modified Files:
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/rdf/rdf.h
monetdb5/extras/rdf/rdfontologyload.c
Branch: rdf
Log Message:
Create header file for reading ontology tables
Move functions and data structures to the new header file
diffs (91 lines):
diff --git a/monetdb5/extras/rdf/Makefile.ag b/monetdb5/extras/rdf/Makefile.ag
--- a/monetdb5/extras/rdf/Makefile.ag
+++ b/monetdb5/extras/rdf/Makefile.ag
@@ -31,7 +31,7 @@ lib__rdf = {
#MODULE
NOINST
#DIR = libdir/monetdb5
- SOURCES = rdf.h rdfschema.h rdfparser.h rdfparser.c rdfontologyload.c
rdf_shredder.c rdfalgebra.c rdfschema.c
+ SOURCES = rdf.h rdfschema.h rdfparser.h rdfparser.c rdfontologyload.h
rdfontologyload.c rdf_shredder.c rdfalgebra.c rdfschema.c
#SEP = _
# LIBS = ./hashmap/librdfhash
diff --git a/monetdb5/extras/rdf/rdf.h b/monetdb5/extras/rdf/rdf.h
--- a/monetdb5/extras/rdf/rdf.h
+++ b/monetdb5/extras/rdf/rdf.h
@@ -45,9 +45,6 @@
rdf_export str
RDFParser(BAT **graph, str *location, str *graphname, str *schemam);
-rdf_export str
-RDFOntologyParser(int *ret, str *location, str *schema);
-
rdf_export str
RDFleftfetchjoin_sortedestimate(int *result, int *lid, int *rid, lng
*estimate);
rdf_export str
diff --git a/monetdb5/extras/rdf/rdfontologyload.c
b/monetdb5/extras/rdf/rdfontologyload.c
--- a/monetdb5/extras/rdf/rdfontologyload.c
+++ b/monetdb5/extras/rdf/rdfontologyload.c
@@ -26,6 +26,7 @@
#include <gdk.h>
#include <rdf.h>
#include <rdfparser.h>
+#include <rdfontologyload.h>
/**
* Ontology vocabulary is stored in two tables
@@ -57,6 +58,8 @@ static OntBATdef ontBatdef[N_ONTOLOGY_BA
{OntAttAtt, "attribute", TYPE_void, TYPE_oid}
};
+
+
static BAT*
create_OntologyBAT(int ht, int tt, int size)
{
@@ -133,6 +136,45 @@ tripleHandler(void* user_data, const rap
return;
}
+
+/*
+static
+OntClass* creatOC(oid ocId, oid subClassofId, int numP, oid* buff)
+{
+ OntClass *oc = (OntClass*)malloc(sizeof(OntClass));
+ oc->lstProp = (oid*) malloc(sizeof(oid) * numP);
+
+ if (oc->lstProp == NULL){
+ printf("Malloc failed. at %d", numP);
+ exit(-1);
+ }
+
+ copyOidSet(oc->lstProp, buff, numP);
+ oc->ocId = ocId;
+ oc->subclassof = subClassofId;
+ oc->numProp = numP;
+ oc->numAllocation = numP;
+ return oc;
+}
+
+str
+RDFOntologyRead(int *ret, bat *ontcBatid, bat *ontaBatid, OntClassset*
ontclassset){
+ BAT* ontcBat; // BAT for ontology classes
+ BAT* ontaBat; // BAT for ontology
+ if ((ontcBat = BATdescriptor(*ontcBatid)) == NULL) {
+ throw(MAL, "rdf.RDFOntologyParser", RUNTIME_OBJECT_MISSING);
+ }
+
+ if ((ontaBat = BATdescriptor(*ontaBatid)) == NULL) {
+ BBPreleaseref(ontcBat->batCacheid);
+ throw(MAL, "rdf.RDFOntologyParser", RUNTIME_OBJECT_MISSING);
+ }
+
+ *ret = 1;
+ return MAL_SUCCEED;
+}
+
+*/
str
RDFOntologyParser(int *xret, str *location, str *schema){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
