X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/463a612e2db05b26a44479b943e9449ce1b20728..ea56a4cd7335ab4afe1df8bf615e134ead1ac98b:/src/sqlite-storage.c diff --git a/src/sqlite-storage.c b/src/sqlite-storage.c index 97aae39..a4ff57a 100644 --- a/src/sqlite-storage.c +++ b/src/sqlite-storage.c @@ -38,11 +38,14 @@ static gchar* lens = "create table lens(" "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"; +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) @@ -64,7 +67,7 @@ gint init_storage(const gchar* path) { if (rc) { gchar* err = g_strdup_printf("Failed to open DB: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); return 1; } @@ -74,7 +77,7 @@ gint init_storage(const gchar* path) { if (rc != SQLITE_OK) { gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_free(ErrMsg); ErrMsg = NULL; @@ -83,7 +86,7 @@ gint init_storage(const gchar* path) { if (rc != SQLITE_OK) { gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_free(ErrMsg); ErrMsg = NULL; @@ -92,7 +95,7 @@ gint init_storage(const gchar* path) { if (rc != SQLITE_OK) { gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_free(ErrMsg); } @@ -110,7 +113,7 @@ gint add_lens(Row* row) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -120,7 +123,7 @@ gint add_lens(Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -130,7 +133,7 @@ gint add_lens(Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -140,7 +143,7 @@ gint add_lens(Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -150,7 +153,7 @@ gint add_lens(Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -160,7 +163,7 @@ gint add_lens(Row* row) { if (rc != SQLITE_ROW) { gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } else { row->id = sqlite3_column_int64(stmt, 0); @@ -181,7 +184,7 @@ gint update_lens(const Row* row) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -191,7 +194,7 @@ gint update_lens(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -201,7 +204,7 @@ gint update_lens(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -211,7 +214,7 @@ gint update_lens(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -221,7 +224,7 @@ gint update_lens(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -231,7 +234,57 @@ gint update_lens(const Row* row) { if (rc != SQLITE_DONE) { gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); + g_free(err); + } else { + status = 0; + } + + sqlite3_finalize(stmt); + + return status; +} + +gint update_lens_maker(const Row* row) { + gint rc; + sqlite3_stmt* stmt; + gint status = 1; + + rc = sqlite3_prepare_v2(db, "update lens set maker = ?1 where id = ?2", -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_message(GTK_MESSAGE_ERROR, err); + g_free(err); + sqlite3_finalize(stmt); + return status; + } + + rc = sqlite3_bind_int64(stmt, 1, row->maker); + if (rc) { + gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + fprintf(stderr, err); + show_message(GTK_MESSAGE_ERROR, err); + g_free(err); + sqlite3_finalize(stmt); + return status; + } + + rc = sqlite3_bind_int64(stmt, 2, row->id); + if (rc) { + gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + fprintf(stderr, err); + show_message(GTK_MESSAGE_ERROR, err); + g_free(err); + sqlite3_finalize(stmt); + return status; + } + + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) { + gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db)); + fprintf(stderr, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } else { status = 0; @@ -251,7 +304,7 @@ gint delete_lens(const Row* row) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -261,7 +314,7 @@ gint delete_lens(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return status; @@ -271,7 +324,7 @@ gint delete_lens(const Row* row) { if (rc != SQLITE_DONE) { gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } else { status = 0; @@ -285,47 +338,47 @@ gint delete_lens(const Row* row) { gint add_maker(const gchar* maker, gchar** error) { gint rc; sqlite3_stmt* stmt; - gint status = -1; + gint id = -1; 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); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); sqlite3_finalize(stmt); - return status; + return id; } rc = sqlite3_bind_text(stmt, 1, maker, -1, NULL); if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); sqlite3_finalize(stmt); - return status; + return id; } rc = sqlite3_step(stmt); 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); } else { - status = sqlite3_column_int64(stmt, 0); + id = sqlite3_column_int64(stmt, 0); } sqlite3_finalize(stmt); - return status; + return id; } Maker* get_maker(gint id) { @@ -337,7 +390,7 @@ Maker* get_maker(gint id) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -347,7 +400,7 @@ Maker* get_maker(gint id) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -373,7 +426,7 @@ void update_maker(const Maker* maker) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return; @@ -383,7 +436,7 @@ void update_maker(const Maker* maker) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return; @@ -393,7 +446,7 @@ void update_maker(const Maker* maker) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return; @@ -404,7 +457,7 @@ void update_maker(const Maker* maker) { if (rc != SQLITE_DONE) { gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); } @@ -413,8 +466,10 @@ void update_maker(const 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) { @@ -427,7 +482,7 @@ gint delete_maker(const gchar* maker, gchar** error) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); @@ -440,7 +495,7 @@ gint delete_maker(const gchar* maker, gchar** error) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); @@ -454,7 +509,7 @@ gint delete_maker(const gchar* maker, gchar** error) { if (rc != SQLITE_DONE) { gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); @@ -477,7 +532,7 @@ GSList* get_makers() { if (rc != SQLITE_OK) { gchar* err = g_strdup_printf("Failed to fetch data: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -502,7 +557,7 @@ gint get_maker_id(const gchar* maker) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return -1; @@ -512,7 +567,7 @@ gint get_maker_id(const gchar* maker) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return -1; @@ -536,7 +591,7 @@ GSList* get_lens_by_maker(gint id) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -546,7 +601,7 @@ GSList* get_lens_by_maker(gint id) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -596,7 +651,7 @@ GSList* get_lens_by_search(const Row* row) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -607,7 +662,7 @@ GSList* get_lens_by_search(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -619,7 +674,7 @@ GSList* get_lens_by_search(const Row* row) { if (rc) { gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); sqlite3_finalize(stmt); return NULL; @@ -658,3 +713,62 @@ void row_free(gpointer data, gpointer user_data) { 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_message(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_message(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_message(GTK_MESSAGE_ERROR, msg); + g_free(msg); + csv_error_clear(&err); + sqlite3_finalize(stmt); + return; + } + } + + sqlite3_finalize(stmt); +} + +