Changeset 28 for vtcross

Timestamp:

11/13/08 15:40:16 (16 years ago)

Author:

ahe

Message:

incorporate ezxml with cbr

Location:

vtcross/trunk

Files:

• another.xml (added)
• src/cbr.c (modified) (8 diffs)
• src/cbr.h (modified) (1 diff)
• src/ezxml.c (added)
• src/ezxml.h (added)
• src/main_cbr.c (modified) (2 diffs)
• src/main_test.c (added)

vtcross/trunk/src/cbr.c

@@ -56 +56 @@
     char *zErrMsg = 0;
 
-    //printf("command: %s\n", _cbr->command);
+    printf("command: %s\n", _cbr->command);
     rc = sqlite3_exec(_cbr->db, _cbr->command, callback, 0, &zErrMsg);
     if( rc!=SQLITE_OK){
@@ -62 +62 @@
         sqlite3_free(zErrMsg);
     } else{
-        //printf("command executed.\n");
+        printf("command executed.\n");
     }
     return rc;
@@ -74 +74 @@
     unsigned int i;
 
-    //printf("command: %s\n", _cbr->command);
+    printf("command: %s\n", _cbr->command);
     sqlite3_stmt * pStatement;
     rc = sqlite3_prepare_v2(_cbr->db, _cbr->command, -1, &pStatement, NULL);
@@ -80 +80 @@
         for (i=0; i<_cbr->num_columns; ++i)
             _retvals[i] = sqlite3_column_double(pStatement, i);
-    } else {
-        //printf("no row found\n");
-        return 0;
     }
     sqlite3_finalize(pStatement);
@@ -94 +91 @@
     }*/
 
-    return 1;
+    return rc;
 }
 
@@ -224 +221 @@
 
     //ExecuteCommand(_cbr);
-    return ExecuteSearchCommand(_cbr, _retvals);
-    
-#if 0
+    ExecuteSearchCommand(_cbr, _retvals);
+    
     printf("search result: ");
     for (i=0; i<_cbr->num_columns; i++)
@@ -233 +229 @@
 
     return 0;
-#endif
 }
 
@@ -243 +238 @@
     
     // generate command
-    //printf("%s\n", _cbr->command);
+    printf("%s\n", _cbr->command);
     strcpy(_cbr->command, "insert into ");
     strcat(_cbr->command, _cbr->tablename);

vtcross/trunk/src/cbr.h

@@ -4 +4 @@
 
 #include "sqlite3.h"
+#include "ezxml.h"
 
 //#define CBR_LEN_FILENAME 64

vtcross/trunk/src/main_cbr.c

@@ -7 +7 @@
 
 int main() {
-    unsigned int num_cols = 7;
-    char * cols[] = {
+    unsigned int num_cols = 7; 
+    unsigned int i;
+
+    ezxml_t f1 = ezxml_parse_file("another.xml"), engine, column;
+    char * cols[num_cols];
+    
+    for (engine = ezxml_child(f1, "engine"); engine; engine = engine->next){
+        i = 0;
+        for (column = ezxml_child(engine, "column"); column; column = column->next){
+            cols[i] = ezxml_child(column, "name")->txt;
+            i++;
+        }
+    }
+
+
+    free(f1);
+                            
+    /* char * cols[] = {
         "BER", "throughput",
         "mod_scheme", "tx_power",
         "noise_power", "path_loss",
         "utility"
-    };
+    };*/
+    
+    for (i = 0; i<num_cols; i++){
+        printf(" %s",cols[i]);
+    }
+    printf("\n");
+
     float vals[num_cols];
     vals[0] = 1e-3f;    // BER
@@ -40 +62 @@
     float retvals[num_cols];
     rc = cbr_search(mycbr, search_names, search_ops, search_vals, 2, retvals);
-    if (rc)
-        printf("solution found!\n");
-    else
-        printf("warning! no solution found\n");
 
     // clean up