Changeset 22 for vtcross/trunk

Timestamp:

10/22/08 14:00:21 (16 years ago)

Author:

ahe

Message:

get returned values from cbr search

Files:

• vtcross/trunk/src/cbr.c (modified) (11 diffs)

vtcross/trunk/src/cbr.c

@@ -50 +50 @@
 
 
-int SearchCallback(float *_retvals, int argc, char **argv, char **azColName){
+/*int SearchCallback(float *_retvals, int argc, char **argv, char **azColName){
     int i;
     for(i=0; i<argc; i++){
@@ -58 +58 @@
     printf("\n");
     return 0;
-}
+}*/
 
 
@@ -80 +80 @@
 int ExecuteSearchCommand(cbr _cbr, float *_retvals){
     int rc;
-    char *zErrMsg = 0;
+    //char *zErrMsg = 0;
+    unsigned int i;
 
     printf("command: %s\n", _cbr->command);
-    rc = sqlite3_exec(_cbr->db, _cbr->command, SearchCallback, _retvals, &zErrMsg);
-    //rc = sqlite3_exec(_cbr->db, _cbr->command, SearchCallback, 0, &zErrMsg);
+    sqlite3_stmt * pStatement;
+    rc = sqlite3_prepare_v2(_cbr->db, _cbr->command, -1, &pStatement, NULL);
+    if (rc == SQLITE_OK && sqlite3_step(pStatement) == SQLITE_ROW){
+        for (i=0; i<_cbr->num_columns; ++i)
+            _retvals[i] = sqlite3_column_double(pStatement, i);
+    }
+    sqlite3_finalize(pStatement);
+    
+    /*rc = sqlite3_exec(_cbr->db, _cbr->command, SearchCallback, 0, &zErrMsg);
     if( rc!=SQLITE_OK){
         fprintf(stderr, "SQL error: %s\n", zErrMsg);
@@ -90 +98 @@
     } else{
         printf("command executed.\n");
-    }
+    }*/
+
     return rc;
 }
@@ -138 +147 @@
 }
 
+
 void cbr_free(cbr _cbr)
 {
-    // delete table here
     // delete table
     
-    /*// generate command, delete all entries of a table
-    strcpy(_cbr->command, "delete from ");
-    strcat(_cbr->command, _cbr->tablename);*/
-
     // generate command, remove a table with its content
     strcpy(_cbr->command, "drop table ");
@@ -161 +166 @@
 }
 
+
 void cbr_print(cbr _cbr)
 {
@@ -175 +181 @@
 }
 
-//static
+
+/*//static
 int cbr_callback(void *notUsed, int argc, char **argv, char **azColName)
 {
     return 0;
-}
+}*/
+
 
 const char * ops_str[] = {
@@ -185 +193 @@
 
 
-// cbr search
 int cbr_search(
     cbr _cbr,
@@ -194 +201 @@
     float *_retvals)
 {
-    // set up statement
-
+    // cbr search
+    
     // generate command
     strcpy(_cbr->command, "select ");
@@ -213 +220 @@
 
         strcat(_cbr->command, _names[i]);
-        //strcat(_cbr->command, " ");
         strcat(_cbr->command, ops_str[_ops[i]]);
         sprintf(str_buffer, "%E", _vals[i]);
@@ -224 +230 @@
     }
 
-    //printf("command: %s\n", _cbr->command);
     ExecuteCommand(_cbr);
     ExecuteSearchCommand(_cbr, _retvals);
+    
     printf("search result: ");
     for (i=0; i<_cbr->num_columns; i++)