]> git.datanom.net - lensdb.git/blobdiff - src/sqlite-storage.c
before transition to proper ide
[lensdb.git] / src / sqlite-storage.c
index dec4344918e6383d21c376178210fda8ccf6618c..cb910bb568ad27d893016a372c859f05c3d1e0f9 100644 (file)
@@ -38,11 +38,14 @@ static gchar* lens = "create table lens("
                                         "maker integer not null,"
                                         "description text not null,"
                                         "notes text,"
                                         "maker integer not null,"
                                         "description text not null,"
                                         "notes text,"
+                                        "date_added datetime DEFAULT current_timestamp,"
                                         "PRIMARY KEY(id AUTOINCREMENT),"
                                         "constraint fk_maker foreign key (maker) references lensmaker (id)"
                                         " on delete cascade);";
 static gchar* search = "SELECT l.id, l.sn, l.description, l.notes, l.maker"
                                           " FROM lens l JOIN lensmaker m on l.maker = m.id";
                                         "PRIMARY KEY(id AUTOINCREMENT),"
                                         "constraint fk_maker foreign key (maker) references lensmaker (id)"
                                         " on delete cascade);";
 static gchar* search = "SELECT l.id, l.sn, l.description, l.notes, l.maker"
                                           " FROM lens l JOIN lensmaker m on l.maker = m.id";
+static gchar* all = "SELECT m.maker,l.sn,l.description,l.notes,l.date_added"
+                                       " FROM lensmaker m JOIN lens l on m.id = l.maker";
 
 void close_storage() {
        if (db != NULL)
 
 void close_storage() {
        if (db != NULL)
@@ -285,9 +288,9 @@ gint delete_lens(const Row* row) {
 gint add_maker(const gchar* maker, gchar** error) {
        gint rc;
        sqlite3_stmt* stmt;
 gint add_maker(const gchar* maker, gchar** error) {
        gint rc;
        sqlite3_stmt* stmt;
-       gint status = 1;
+       gint status = -1;
        
        
-       rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1)", -1, &stmt, 0);
+       rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1) returning id", -1, &stmt, 0);
        if (rc != SQLITE_OK) {
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
@@ -312,18 +315,17 @@ gint add_maker(const gchar* maker, gchar** error) {
        }
        
        rc = sqlite3_step(stmt);
        }
        
        rc = sqlite3_step(stmt);
-    if (rc != SQLITE_DONE) {
-               gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
+    if (rc != SQLITE_ROW) {
+               gchar* err = g_strdup_printf("Couldn't insert maker: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
                show_err_msg(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
                fprintf(stderr, err);
                show_err_msg(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
-               sqlite3_finalize(stmt);
-               return status;
-    }
-    
-    status = 0;
+    } else {
+               status = sqlite3_column_int64(stmt, 0);
+       }
+
     sqlite3_finalize(stmt);
 
        return status;
     sqlite3_finalize(stmt);
 
        return status;
@@ -414,8 +416,10 @@ void update_maker(const Maker* maker) {
 }
 
 void maker_free(Maker* maker) {
 }
 
 void maker_free(Maker* maker) {
-       g_free(maker->maker_name);
-       g_free(maker);
+       if (maker) {
+               g_free(maker->maker_name);
+               g_free(maker);
+       }
 }
 
 gint delete_maker(const gchar* maker, gchar** error) {
 }
 
 gint delete_maker(const gchar* maker, gchar** error) {
@@ -497,7 +501,7 @@ GSList* get_makers() {
 gint get_maker_id(const gchar* maker) {
        gint rc;
        sqlite3_stmt* stmt;
 gint get_maker_id(const gchar* maker) {
        gint rc;
        sqlite3_stmt* stmt;
-       gint id = 0;
+       gint id = -1;
        
        rc = sqlite3_prepare_v2(db, "select id from lensmaker where maker = ?1", -1, &stmt, 0);
        if (rc != SQLITE_OK) {   
        
        rc = sqlite3_prepare_v2(db, "select id from lensmaker where maker = ?1", -1, &stmt, 0);
        if (rc != SQLITE_OK) {   
@@ -659,3 +663,62 @@ void row_free(gpointer data, gpointer user_data) {
        g_free(row);
 }
 
        g_free(row);
 }
 
+void dump_storage(CsvParser* parser) {
+       gint rc;
+       sqlite3_stmt* stmt;
+       CvsError* err = NULL;
+
+       if (parser == NULL) return;
+       
+       rc = sqlite3_prepare_v2(db, all, -1, &stmt, 0);
+       if (rc != SQLITE_OK) {   
+               gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
+               fprintf(stderr, err);
+               show_err_msg(GTK_MESSAGE_ERROR, err);
+               g_free(err);
+        sqlite3_finalize(stmt);
+        return;
+    }  
+       
+       Record* row = g_new0(Record, 1);
+       row->maker = g_strdup("maker");
+       row->sn = g_strdup("sn");
+       row->data = g_strdup("lens");
+       row->notes = g_strdup("notes");
+       row->date = g_strdup("date");
+       csv_parser_dump_row(parser, row, &err);
+       csv_record_free(row);
+       if (err) {
+               gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message);
+               fprintf(stderr, msg);
+               show_err_msg(GTK_MESSAGE_ERROR, msg);
+               g_free(msg);
+               csv_error_clear(&err);
+               sqlite3_finalize(stmt);
+               return;
+       }
+       
+       while (sqlite3_step(stmt) == SQLITE_ROW) {
+               row = g_new0(Record, 1);
+               row->maker = g_strdup((const gchar*)sqlite3_column_text(stmt, 0));
+               row->sn = g_strdup((const gchar*)sqlite3_column_text(stmt, 1));
+               row->data = g_strdup((const gchar*)sqlite3_column_text(stmt, 2));
+               row->notes = g_strdup((const gchar*)sqlite3_column_text(stmt, 3));
+               row->date = g_strdup((const gchar*)sqlite3_column_text(stmt, 4));
+               csv_parser_dump_row(parser, row, &err);
+               csv_record_free(row);
+               if (err) {
+                       gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message);
+                       fprintf(stderr, msg);
+                       show_err_msg(GTK_MESSAGE_ERROR, msg);
+                       g_free(msg);
+                       csv_error_clear(&err);
+                       sqlite3_finalize(stmt);
+                       return;
+               }
+    }
+    
+    sqlite3_finalize(stmt);
+}
+
+
This page took 0.398123 seconds and 5 git commands to generate.