X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/179330c182e214968fd725c9cbbff9d41c683cf8..refs/heads/release/0.9.4:/src/sqlite-storage.c diff --git a/src/sqlite-storage.c b/src/sqlite-storage.c index cb910bb..a4ff57a 100644 --- a/src/sqlite-storage.c +++ b/src/sqlite-storage.c @@ -67,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; } @@ -77,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; @@ -86,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; @@ -95,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); } @@ -113,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; @@ -123,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; @@ -133,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; @@ -143,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; @@ -153,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; @@ -163,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); @@ -184,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; @@ -194,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; @@ -204,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; @@ -214,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; @@ -224,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; @@ -234,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; @@ -254,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; @@ -264,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; @@ -274,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; @@ -288,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) { @@ -340,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; @@ -350,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; @@ -376,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; @@ -386,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; @@ -396,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; @@ -407,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); } @@ -432,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)); @@ -445,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)); @@ -459,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)); @@ -482,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; @@ -507,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; @@ -517,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; @@ -541,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; @@ -551,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; @@ -601,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; @@ -612,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; @@ -624,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; @@ -674,7 +724,7 @@ void dump_storage(CsvParser* parser) { 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; @@ -691,7 +741,7 @@ void dump_storage(CsvParser* parser) { if (err) { gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message); fprintf(stderr, msg); - show_err_msg(GTK_MESSAGE_ERROR, msg); + show_message(GTK_MESSAGE_ERROR, msg); g_free(msg); csv_error_clear(&err); sqlite3_finalize(stmt); @@ -710,7 +760,7 @@ void dump_storage(CsvParser* parser) { if (err) { gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message); fprintf(stderr, msg); - show_err_msg(GTK_MESSAGE_ERROR, msg); + show_message(GTK_MESSAGE_ERROR, msg); g_free(msg); csv_error_clear(&err); sqlite3_finalize(stmt);