The R Project SVN – R-packages – Diff – /trunk/SQLiteDF/src/sqlite_vector.c

+    }
     char *iname = SDF_INAME(sdf);
     char *varname = CHAR_ELT(name, 0);
+    if (!USE_SDF(iname)) return R_NilValue;
     /* check if sdf & varname w/in that sdf exists */
     sqlite3_stmt *stmt;
     sprintf(g_sql_buf[0], "select [%s] from [%s].sdf_data", varname, iname);
     int res = sqlite3_prepare(g_workspace, g_sql_buf[0], -1, &stmt, 0);
     return added;
+}
 SEXP sdf_get_variable_length(SEXP svec) {
     char *iname = SDF_INAME(svec);
+    if (!USE_SDF(iname)) return R_NilValue;
     sprintf(g_sql_buf[0], "[%s].sdf_data", iname);
     SEXP ret;
     PROTECT(ret = NEW_INTEGER(1));
     INTEGER(ret)[0] = _get_row_count2(g_sql_buf[0]);
 SEXP sdf_get_variable_index(SEXP svec, SEXP idx) {
     SEXP ret = R_NilValue, tmp;
     char *iname = SDF_INAME(svec), *varname = SVEC_VARNAME(svec);
     int index, idxlen, i, retlen=0, res;
+    if (!USE_SDF(iname)) return R_NilValue;
     /* check if sdf exists */
     sqlite3_stmt *stmt;
     sprintf(g_sql_buf[0], "select [%s] from [%s].sdf_data", varname, iname);
     res = sqlite3_prepare(g_workspace, g_sql_buf[0], -1, &stmt, 0);
     sqlite3_finalize(stmt);
     funcname = CHAR_ELT(func, 0);
     iname_src = SDF_INAME(vector);
     varname_src = SVEC_VARNAME(vector);
     nargs = INTEGER(_nargs)[0];
+    if (!USE_SDF(iname_src)) return R_NilValue;
     /* check nargs */
     if (nargs > 2) {
         Rprintf("Error: Don't know how to handle Math functions w/ more than 2 args\n");
         return R_NilValue;
+    }
+    }
     sqlite3_step(stmt);
     sqlite3_finalize(stmt);
-    /* add to workspace */
-    strcpy(g_sql_buf[0], iname);
-    iname[namelen] = '.';
-    _add_sdf1(iname,  g_sql_buf[0]);
-    iname[namelen] = 0;
     /* create sqlite.vector sexp */
     SEXP ret, value; int nprotected = 0;
     PROTECT(ret = NEW_LIST(2)); nprotected++;
     /* set list names */

The R Project SVN R-packages

(root)/trunk/SQLiteDF/src/sqlite_vector.c @ 4160 – Rev 3307 → 3308