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

  * UTILITY FUNCTIONS
  ****************************************************************************/
 /* if user supplied a name, return that name. otherwise, use the
  * default "data" */
-int _check_sdf_name(SEXP name, char **rname, char **iname, int *file_idx) {
+static int _check_sdf_name(SEXP name, char **rname, char **iname, int *file_idx) {
     int namelen = 0;
     /* check if arg name is supplied */
     if (IS_CHARACTER(name)) {
         *rname = CHAR_ELT(name,0);
         Rprintf("Error: the supplied value for arg name is not a string.\n");
+    }
     return namelen;
+}
-int _find_free_filename(char *rname, char **iname, int *namelen, int *file_idx) {
+static int _find_free_filename(char *rname, char **iname, int *namelen, int *file_idx) {
     do {
         if (!_file_exists(*iname)) break;
         *namelen = sprintf(*iname, "%s%d.db", rname, ++(*file_idx)) - 3;
     } while (*file_idx < 10000);
         res = _sqlite_exec(g_sql_buf[2]);
+    }
     return res;
+}
+char *_create_sdf_skeleton2(SEXP name, int *onamelen) {
+    char *iname, *rname;
+    int namelen, file_idx = 0, res;
+    namelen = _check_sdf_name(name, &rname, &iname, &file_idx);
+    if (!namelen) return NULL;
+    _find_free_filename(rname, &iname, &namelen, &file_idx);
+    if (file_idx >= 10000) {
+        Rprintf("Error: cannot find free SDF name.\n");
+        return NULL;
+    }
+    /* create new db by attaching a non-existent file */
+    iname[namelen] = 0; /* remove ".db" */
+    sprintf(g_sql_buf[2], "attach '%s.db' as [%s]", iname, iname);
+    res = _sqlite_exec(g_sql_buf[2]);
+    if (_sqlite_error(res)) return NULL;
+    /* create attributes table */
+    res = _create_sdf_attribute2(iname);
+    if (_sqlite_error(res)) {
+        sprintf(g_sql_buf[2], "detach '%s'", iname);
+        return NULL;
+    }
+    *onamelen = namelen;
+    return iname;
+}
 /* checks if a column has a corresponding factor|ordered table */
 static int _is_factor2(const char *iname, const char *factor_type, const char *colname) {
     sqlite3_stmt *stmt;
     sprintf(g_sql_buf[2], "select * from [%s].[%s %s]", iname, factor_type,
             colname);
  * SDF FUNCTIONS
  ****************************************************************************/
 SEXP sdf_create_sdf(SEXP df, SEXP name) {
     SEXP ret;
-    char *rname, *iname;
+    char *iname;
-    int file_idx = 0, namelen, res, i, j;
+    int namelen, res, i, j;
-    namelen = _check_sdf_name(name, &rname, &iname, &file_idx);
-    if (!namelen) return R_NilValue;
-    /* at this point, iname will contain #{iname}.db */
+    /* find free name, attach sdf, create sdf_attributes */
-    _find_free_filename(rname, &iname, &namelen, &file_idx);
+    iname = _create_sdf_skeleton2(name, &namelen);
-    /* found a free number */
-    if (file_idx < 10000) {
+    if (iname != NULL) {
-        /* create a sdf db file by running "attach" statement to non-existent
-         * db file
-         */
         int sql_len, sql_len2;
         sqlite3_stmt *stmt;
-        iname[namelen] = 0;  /* remove ".db" */
-        sql_len = sprintf(g_sql_buf[0], "attach '%s.db' as %s", iname, iname);
-        res = _sqlite_exec(g_sql_buf[0]);
-        if (_sqlite_error(res)) return R_NilValue; /* duplicate dbname */
-        /*
-         * create tables for the sdf db
-         */
-        /* create sdf_attributes table */
-        res = _create_sdf_attribute2(iname);
-        if (_sqlite_error(res)) return R_NilValue;
         /* create sdf_data table */
         SEXP names = GET_NAMES(df), variable, levels;
         int ncols = GET_LENGTH(names), type, *types;
         char *col_name, *class, *factor;
                 for (j = 0; j < GET_LENGTH(levels); j++) {
                     sqlite3_reset(stmt);
                     factor = CHAR(STRING_ELT(levels, j));
                     sqlite3_bind_int(stmt, 1, j+1);
-                    sqlite3_bind_text(stmt, 2, factor, strlen(factor), SQLITE_STATIC);
+                    sqlite3_bind_text(stmt, 2, factor, -1, SQLITE_STATIC);
                     sqlite3_step(stmt);
+                }
                 sqlite3_finalize(stmt);
+            }
+        }
          * create a new object representing the sdf
          */
         ret = _create_sdf_sexp(iname);
     } else {
-        Rprintf("ERROR: cannot find a free internal name for %s", rname);
+        Rprintf("ERROR: cannot find a free internal name.");
         ret = R_NilValue;
+    }
     return ret;
+}
             sqlite3_finalize(stmt);
             return ret;
         } if (col_index_len > 1) {
             /* create a new SDF, logic similar to sdf_create_sdf */
-            /* we have to close the current statement so we can do
-             * edits in the db */
-            /* sqlite3_finalize(stmt); */
             /* find a new name. data<n> ? */
-            char *iname2, *rname2;
+            char *iname2;
             const char *colname;
-            int namelen, file_idx = 0, sql_len, sql_len2;
+            int namelen, sql_len, sql_len2;
-            namelen = _check_sdf_name(R_NilValue, &rname2, &iname2, &file_idx);
-            if (!namelen) return R_NilValue;
-            _find_free_filename(rname2, &iname2, &namelen, &file_idx);
-            if (file_idx >= 10000) {
-                Rprintf("Error: cannot find free SDF name.\n");
-                return R_NilValue;
-            }
-            /* create new db by attaching a non-existent file */
-            iname2[namelen] = 0; /* remove ".db" */
-            sprintf(g_sql_buf[1], "attach '%s.db' as %s", iname2, iname2);
-            res = _sqlite_exec(g_sql_buf[1]);
-            if (_sqlite_error(res)) return R_NilValue;
-            /* create attributes table */
-            res = _create_sdf_attribute2(iname2);
+            iname2 = _create_sdf_skeleton2(R_NilValue, &namelen);
-            if (_sqlite_error(res)) return R_NilValue;
             /* create sdf_data table */
             sql_len = sprintf(g_sql_buf[1], "create table [%s].sdf_data ([row name] text", iname2);
             sql_len2 = 0;

The R Project SVN R-packages

(root)/trunk/SQLiteDF/src/sqlite_dataframe.c – Rev 3284 → 3307