Changeset: 750325b4218a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=750325b4218a
Modified Files:
monetdb5/extras/rdf/rdfontologyload.c
monetdb5/extras/rdf/rdfschema.c
sql/backends/monet5/sql.mx
Branch: rdf
Log Message:
Fix problems/errors reported by Testweb compilation
diffs (99 lines):
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
@@ -130,7 +130,8 @@ tripleHandler(void* user_data, const rap
//BUN bun = BUN_NONE;
//BAT **graph = pdata->graph;
- printf("%s %s
%s\n",raptor_term_to_string(triple->subject),raptor_term_to_string(triple->predicate),raptor_term_to_string(triple->object));
+ (void) triple;
+ //printf("%s %s %s\n",(char*)
raptor_term_to_string(triple->subject),(char *)
raptor_term_to_string(triple->predicate), (char
*)raptor_term_to_string(triple->object));
pdata->tcount++;
return;
diff --git a/monetdb5/extras/rdf/rdfschema.c b/monetdb5/extras/rdf/rdfschema.c
--- a/monetdb5/extras/rdf/rdfschema.c
+++ b/monetdb5/extras/rdf/rdfschema.c
@@ -984,7 +984,8 @@ void mergeOidSets(oid* arr1, oid* arr2,
static
CS* mergeTwoCSs(CS cs1, CS cs2, int freqIdx1, int freqIdx2, oid mergeCSId){
- int numCombineP;
+ int numCombineP = 0;
+
CS *mergecs = (CS*) malloc (sizeof (CS));
mergecs->type = MERGECS;
mergecs->numConsistsOf = 2;
@@ -2215,6 +2216,7 @@ void mergeMaximumFreqCSsAll(CSset *freqC
CS *existmergecs, *mergecs1, *mergecs2;
PropStat *propStat; /* Store statistics about properties */
+ int nummergedCSs = 0;
for (i = 0; i < freqCSset->numCSadded; i++){
@@ -2254,7 +2256,8 @@ void mergeMaximumFreqCSsAll(CSset *freqC
//printf(" Cosine = %f \n", simscore);
}
-
+
+ //simscore = 0.0;
#if USINGTFIDF
if (simscore > SIM_TFIDF_THRESHOLD){
#else
@@ -2302,6 +2305,13 @@ void mergeMaximumFreqCSsAll(CSset *freqC
}
+ for (i = 0; i < freqCSset->numCSadded; i++){
+ if (freqCSset->items[i].parentFreqIdx == -1){
+ nummergedCSs++;
+ }
+ }
+ printf("Number of freqCS after merging: %d \n", nummergedCSs);
+
freePropStat(propStat);
}
@@ -3558,7 +3568,7 @@ str RDFdistTriplesToCSs(int *ret, bat *s
int lasttblIdx = -1;
int lastColIdx = -1;
char tmpIsdefault = 0;
- BUN bun;
+ BUN bun = BUN_NONE;
int i,j;
BAT *curBat = NULL;
BAT *tmpmvBat = NULL; // Multi-values BAT
@@ -3741,7 +3751,7 @@ str RDFdistTriplesToCSs(int *ret, bat *s
int lasttblIdx = -1;
int lastColIdx = -1;
char tmpIsdefault = 0;
- BUN bun;
+ BUN bun = BUN_NONE;
int i,j;
BAT *curBat = NULL;
BAT *tmpmvBat = NULL; // Multi-values BAT
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -7587,7 +7587,7 @@ SQLrdfShred(Client cntxt, MalBlkPtr mb,
str
SQLrdfreorganize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
-
+#ifdef HAVE_RAPTOR
mvc *m = NULL;
str *schema = (str *) getArgReference(stk,pci,1);
str *tbname = (str *) getArgReference(stk,pci,2);
@@ -7753,6 +7753,10 @@ SQLrdfreorganize(Client cntxt, MalBlkPtr
free(viewcstables);
return MAL_SUCCEED;
+#else
+ (void) cntxt; (void) mb; (void) stk; (void) pci;
+ throw(SQL, "sql.SQLrdfreorganize", "RDF support is missing from
MonetDB5");
+#endif /* HAVE_RAPTOR */
}
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
