Changeset: e9de418eb45c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9de418eb45c
Modified Files:
monetdb5/extras/rdf/rdfschema.c
sql/backends/monet5/sql_rdf.c
Branch: rdf
Log Message:
Use prop. name instead of id for column
diffs (67 lines):
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
@@ -6019,17 +6019,23 @@ void getTblName(str *name, oid nameId, B
s = *name;
strcpy(s,canStrShort);
- //Convert to lower case
for (i = 0; i < lngth; i++){
+ //Convert to lower case
+ /*
if (s[i] >= 65 && s[i] <= 90){
s[i] = s[i] | 32;
- }
+ }
+ */
+
+ //Replace all non-alphabet character by ___
+ if (!isalpha(s[i])){
+ s[i] = '_';
+ }
}
s += lngth;
*s = '\0';
}
-
GDKfree(canStr);
GDKfree(canStrShort);
diff --git a/sql/backends/monet5/sql_rdf.c b/sql/backends/monet5/sql_rdf.c
--- a/sql/backends/monet5/sql_rdf.c
+++ b/sql/backends/monet5/sql_rdf.c
@@ -565,6 +565,7 @@ SQLrdfreorganize(Client cntxt, MalBlkPtr
char tmpstr[20];
char tmptbnameex[100];
//char tmpviewname[100];
+ str baseColName;
char tmpcolname[100];
//char viewcommand[500];
sql_subtype tpe;
@@ -723,7 +724,11 @@ SQLrdfreorganize(Client cntxt, MalBlkPtr
for (j = 0; j < cstablestat->numPropPerTable[i]; j++){
//TODO: Use propertyId from Propstat
- sprintf(tmpcolname,
"col"BUNFMT,(cstablestat->lstcstable[i].lstProp[j]));
+ sprintf(tmpstr, "%d",j);
+ getTblName(&baseColName,
cstablestat->lstcstable[i].lstProp[j], mapi, mbat);
+ sprintf(tmpcolname, "%s", baseColName);
+ strcat(tmpcolname,tmpstr);
+ //sprintf(tmpcolname,
"col"BUNFMT,(cstablestat->lstcstable[i].lstProp[j]));
tmpbat = cstablestat->lstcstable[i].colBats[j];
@@ -785,7 +790,11 @@ SQLrdfreorganize(Client cntxt, MalBlkPtr
for (j = 0; j < cstablestat->numPropPerTable[i]; j++){
//TODO: Use propertyId from Propstat
- sprintf(tmpcolname,
"col"BUNFMT,(cstablestat->lstcstable[i].lstProp[j]));
+ sprintf(tmpstr, "%d",j);
+ getTblName(&baseColName,
cstablestat->lstcstable[i].lstProp[j], mapi, mbat);
+ sprintf(tmpcolname, "%s", baseColName);
+ strcat(tmpcolname,tmpstr);
+ //sprintf(tmpcolname,
"col"BUNFMT,(cstablestat->lstcstable[i].lstProp[j]));
tmpbat = cstablestat->lstcstable[i].colBats[j];
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
