From: Michael Rasmussen Date: Mon, 21 Oct 2024 21:45:36 +0000 (+0200) Subject: missing add from lens via EXIF X-Git-Url: http://git.datanom.net/lensdb.git/commitdiff_plain/043ec3942020c1122ea256604c047442ac059cad missing add from lens via EXIF Signed-off-by: Michael Rasmussen --- diff --git a/src/gui.c b/src/gui.c index 19663d1..dd634a5 100644 --- a/src/gui.c +++ b/src/gui.c @@ -45,6 +45,27 @@ static void clean(gpointer data) { gtk_main_quit(); } +/* + * GTK_MESSAGE_INFO + * GTK_MESSAGE_WARNING + * GTK_MESSAGE_QUESTION + * GTK_MESSAGE_ERROR + * GTK_MESSAGE_OTHER + */ +void show_err_msg(GtkMessageType type, const gchar* msg) { + GtkWidget* window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window")); + + GtkWidget* dialog = gtk_message_dialog_new( + GTK_WINDOW(window), + GTK_DIALOG_DESTROY_WITH_PARENT, + type, + GTK_BUTTONS_OK, + msg); + + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} + static void hide_input_dialog() { GtkWidget* input_dialog = GTK_WIDGET(gtk_builder_get_object(builder, "input_dialog")); @@ -250,8 +271,10 @@ static void add_row(gint maker, Row* row) { GtkTreeIter iter; GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); + GtkWidget* scrolled_window = NULL; Maker* maker_info = get_maker(maker); - GtkWidget* scrolled_window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), maker_info->page); + if (maker_info->page >= 0) + scrolled_window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), maker_info->page); if (scrolled_window == NULL) { /* new maker */ GtkWidget* tab_label = gtk_label_new(maker_info->maker_name); @@ -272,7 +295,10 @@ static void add_row(gint maker, Row* row) { maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, maker); if (maker_info->page < 0) { /* Huston whe have a problem */ - fprintf(stderr, "%s: Could not create tab\n", maker_info->maker_name); + gchar* err = g_strdup_printf("%s: Could not create tab\n", maker_info->maker_name); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); } else { update_maker(maker_info); } @@ -280,14 +306,18 @@ static void add_row(gint maker, Row* row) { } else { treeview = gtk_bin_get_child(GTK_BIN(scrolled_window)); } - store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview))); - gtk_list_store_append(store, &iter); - gtk_list_store_set (store, &iter, - COLUMN_DEFAULT_SN, row->sn, - COLUMN_DEFAULT_DATA, row->data, - COLUMN_DEFAULT_NOTES, row->notes, - COLUMN_DEFAULT_ID, row->id, - -1); + + if (row) { + store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview))); + gtk_list_store_append(store, &iter); + gtk_list_store_set (store, &iter, + COLUMN_DEFAULT_SN, row->sn, + COLUMN_DEFAULT_DATA, row->data, + COLUMN_DEFAULT_NOTES, row->notes, + COLUMN_DEFAULT_ID, row->id, + -1); + } + gtk_widget_show_all(notebook); } @@ -337,13 +367,17 @@ static void initialize_notebook() { for (ids = makers; ids; ids = ids->next) { gint id = get_maker_id(ids->data); GSList* lenses = get_lens_by_maker(id); - for (rows = lenses; rows; rows = rows->next) { - Row* row = rows->data; - add_row(id, row); + if (lenses) { + for (rows = lenses; rows; rows = rows->next) { + Row* row = rows->data; + add_row(id, row); + } + g_slist_foreach(lenses, (GFunc)row_free, NULL); + g_slist_free(lenses); + lenses = NULL; + } else { + add_row(id, NULL); } - g_slist_foreach(lenses, (GFunc)row_free, NULL); - g_slist_free(lenses); - lenses = NULL; } g_slist_foreach(makers, (GFunc)g_free, NULL); g_slist_free(makers); @@ -384,70 +418,32 @@ G_MODULE_EXPORT void add_maker_clicked_cb(GtkWidget* self, gpointer data) { if (res == GTK_RESPONSE_ACCEPT) { const gchar* maker = gtk_entry_get_text(GTK_ENTRY(maker_entry)); - fprintf(stderr, "%s\n", maker); - - GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); - GtkWidget* tab_label = gtk_label_new(maker); - GtkListStore* store = gtk_list_store_new(4, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INT64); - GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_DATA); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_SN); - g_signal_connect(treeview, "row-activated", G_CALLBACK(on_row_activated), NULL); - g_object_unref(store); - add_columns(GTK_TREE_VIEW(treeview), VIEWTYPE_DEFAULT); - GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL); - g_object_set(scrolled_window, "vexpand", TRUE, NULL); - gtk_container_add(GTK_CONTAINER(scrolled_window), treeview); - gint page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label); - if (page < 0) { - // Huston whe have a problem - fprintf(stderr, "%s: Could not create tab\n", maker); + gchar* error = NULL; + + if (!add_maker(maker, &error)) { + GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); + GtkWidget* tab_label = gtk_label_new(maker); + gint page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), NULL, tab_label); + if (page < 0) { + // Huston whe have a problem + gchar* err = g_strdup_printf("%s: Could not create tab\n", maker); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); + } else { + gtk_widget_show_all(notebook); + } } else { - //update_maker(maker_info); - gtk_widget_show_all(notebook); + // Huston whe have a problem + gchar* err = g_strdup_printf("%s: Could not add Maker '%s'\n", error, maker); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); } + g_free(error); } - + gtk_widget_destroy(dialog); -/* - g_signal_connect_swapped(dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - - gtk_container_add (GTK_CONTAINER(content_area), maker_entry); - gtk_widget_show_all (dialog); -*/ -/* - GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); - - GtkWidget* tab_label = gtk_label_new(maker_info->maker_name); - store = gtk_list_store_new(4, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INT64); - treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_DATA); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_SN); - g_signal_connect(treeview, "row-activated", G_CALLBACK(on_row_activated), NULL); - g_object_unref(store); - add_columns(GTK_TREE_VIEW(treeview), VIEWTYPE_DEFAULT); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - g_object_set(scrolled_window, "vexpand", TRUE, NULL); - gtk_container_add(GTK_CONTAINER(scrolled_window), treeview); - maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, maker); - if (maker_info->page < 0) { - // Huston whe have a problem - fprintf(stderr, "%s: Could not create tab\n", maker_info->maker_name); - } else { - update_maker(maker_info); - } - */ } G_MODULE_EXPORT void add_lens_clicked_cb(GtkWidget* self, gpointer data) { @@ -521,6 +517,13 @@ G_MODULE_EXPORT void input_close_clicked_cb(GtkWidget* self, GtkBuilder* data) { G_MODULE_EXPORT void input_ok_clicked_cb(GtkWidget* self, gpointer data) { Row* row = row_new(); + GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); + gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); + GtkWidget* child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), cur_page); + const gchar* label = gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(notebook), child); + + row->maker = get_maker_id(label); + GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id")); row->id = atol(gtk_entry_get_text(GTK_ENTRY(entry_id))); @@ -538,7 +541,10 @@ G_MODULE_EXPORT void input_ok_clicked_cb(GtkWidget* self, gpointer data) { if (cur_view != NULL) { if (update_lens(row)) { - fprintf(stderr, "Update failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes); + gchar* err = g_strdup_printf("Update failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); } GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view)); gtk_list_store_set(store, &cur_iter, COLUMN_DEFAULT_SN, row->sn, -1); @@ -546,12 +552,11 @@ G_MODULE_EXPORT void input_ok_clicked_cb(GtkWidget* self, gpointer data) { gtk_list_store_set(store, &cur_iter, COLUMN_DEFAULT_NOTES, row->notes, -1); } else { /* New lens */ - GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); - gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); - GtkWidget* child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), cur_page); - const gchar* label = gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(notebook), child); if (add_lens(row)) { - fprintf(stderr, "Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes); + gchar* err = g_strdup_printf("Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); } else { add_row(get_maker_id(label), row); } diff --git a/src/gui.h b/src/gui.h index f3140fc..cfa3adc 100644 --- a/src/gui.h +++ b/src/gui.h @@ -52,6 +52,7 @@ enum { }; gboolean init_gui(); +void show_err_msg(GtkMessageType type, const gchar* msg); G_END_DECLS diff --git a/src/main.c b/src/main.c index f8992db..9ad343a 100644 --- a/src/main.c +++ b/src/main.c @@ -41,7 +41,10 @@ gint main(gint argc, gchar** argv) { } else { gtk_init(&argc, &argv); if (init_gui()) { - fprintf(stderr, "Failed initializing GUI\n"); + gchar* err = g_strdup_printf("Failed initializing GUI\n"); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); return EXIT_FAILURE; } } diff --git a/src/sqlite-storage.c b/src/sqlite-storage.c index 8206387..9a0fddf 100644 --- a/src/sqlite-storage.c +++ b/src/sqlite-storage.c @@ -23,12 +23,13 @@ #include #include "sqlite-storage.h" +#include "gui.h" #define DBNAME "lensdb.db" static sqlite3* db = NULL; static gchar* lensmaker = "create table lensmaker(" "id integer primary key not null AUTOINCREMENT," - "maker text not null," + "maker text not null UNIQUE," "page int DEFAULT -1);"; static gchar* lens = "create table lens(" "id integer primary key not null AUTOINCREMENT," @@ -59,26 +60,38 @@ gint init_storage(const gchar* path) { g_free(file); if (rc) { - fprintf(stderr, "Failed to open DB: %s\n", sqlite3_errmsg(db)); + gchar* err = g_strdup_printf("Failed to open DB: %s\n", sqlite3_errmsg(db)); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); return 1; } if (init_db) { rc = sqlite3_exec(db, "PRAGMA foreign_keys = ON", 0, 0, &ErrMsg); if (rc != SQLITE_OK) { - fprintf(stderr, "SQL error: %s\n", ErrMsg); + gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); sqlite3_free(ErrMsg); ErrMsg = NULL; } rc = sqlite3_exec(db, lensmaker, 0, 0, &ErrMsg); if (rc != SQLITE_OK) { - fprintf(stderr, "SQL error: %s\n", ErrMsg); + gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); sqlite3_free(ErrMsg); ErrMsg = NULL; } rc = sqlite3_exec(db, lens, 0, 0, &ErrMsg); if (rc != SQLITE_OK) { - fprintf(stderr, "SQL error: %s\n", ErrMsg); + gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); sqlite3_free(ErrMsg); } } @@ -91,36 +104,62 @@ gint add_lens(const Row* row) { sqlite3_stmt* stmt; gint status = 1; - rc = sqlite3_prepare_v2(db, "inserte lens (sn, description, notes) values (?1, ?2, ?3)", -1, &stmt, 0); + rc = sqlite3_prepare_v2(db, "insert into lens (sn, maker, description, notes) values (?1, ?2, ?3, ?4)", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); + 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 status; } rc = sqlite3_bind_text(stmt, 1, row->sn, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } - rc = sqlite3_bind_text(stmt, 2, row->data, -1, NULL); + rc = sqlite3_bind_int(stmt, 2, row->maker); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } - rc = sqlite3_bind_text(stmt, 3, row->notes, -1, NULL); + rc = sqlite3_bind_text(stmt, 3, row->data, -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); + g_free(err); + sqlite3_finalize(stmt); + return status; + } + + rc = sqlite3_bind_text(stmt, 4, row->notes, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } - if (sqlite3_step(stmt) != SQLITE_DONE) { - fprintf(stderr, "Step failure: %s\n", sqlite3_errmsg(db)); + rc = sqlite3_step(stmt); + 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); + g_free(err); } else { status = 0; } @@ -137,41 +176,60 @@ gint update_lens(const Row* row) { rc = sqlite3_prepare_v2(db, "update lens set sn = ?1, description = ?2, notes = ?3 where id = ?4", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); - sqlite3_finalize(stmt); + 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 status; } rc = sqlite3_bind_text(stmt, 1, row->sn, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } rc = sqlite3_bind_text(stmt, 2, row->data, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } rc = sqlite3_bind_text(stmt, 3, row->notes, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } rc = sqlite3_bind_int64(stmt, 4, row->id); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return status; } - if (sqlite3_step(stmt) != SQLITE_DONE) { - fprintf(stderr, "Step failure: %s\n", sqlite3_errmsg(db)); + rc = sqlite3_step(stmt); + 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); + g_free(err); } else { status = 0; } @@ -181,9 +239,50 @@ gint update_lens(const Row* row) { return status; } -gint add_maker(const gchar* maker) { +gint add_maker(const gchar* maker, gchar** error) { + gint rc; + sqlite3_stmt* stmt; gint status = 1; + rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1)", -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); + if (error) + *error = g_strdup(sqlite3_errmsg(db)); + sqlite3_finalize(stmt); + return status; + } + + 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); + g_free(err); + if (error) + *error = g_strdup(sqlite3_errmsg(db)); + sqlite3_finalize(stmt); + return status; + } + + rc = sqlite3_step(stmt); + if (rc != SQLITE_OK) { + 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); + g_free(err); + if (error) + *error = g_strdup(sqlite3_errmsg(db)); + sqlite3_finalize(stmt); + return status; + } + + status = 0; + sqlite3_finalize(stmt); + return status; } @@ -194,14 +293,20 @@ Maker* get_maker(gint id) { rc = sqlite3_prepare_v2(db, "select maker, page from lensmaker where id = ?1", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); + 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 NULL; } rc = sqlite3_bind_int64(stmt, 1, id); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return NULL; } @@ -224,30 +329,45 @@ void update_maker(const Maker* maker) { rc = sqlite3_prepare_v2(db, "update lensmaker set page = ?1 where id = ?2", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); + 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; } - rc = sqlite3_bind_int64(stmt, 1, maker->page); + rc = sqlite3_bind_int(stmt, 1, maker->page); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return; } - rc = sqlite3_bind_int64(stmt, 1, maker->id); + rc = sqlite3_bind_int64(stmt, 2, maker->id); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return; } - if (sqlite3_step(stmt) != SQLITE_DONE) { - fprintf(stderr, "Step failure: %s\n", sqlite3_errmsg(db)); + //fprintf(stderr, "%s\n", sqlite3_expanded_sql(stmt)); + rc = sqlite3_step(stmt); + 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); + g_free(err); + sqlite3_finalize(stmt); } - - sqlite3_finalize(stmt); + + sqlite3_finalize(stmt); } void maker_free(Maker* maker) { @@ -266,9 +386,12 @@ GSList* get_makers() { sqlite3_stmt* stmt; GSList* makers = NULL; - rc = sqlite3_prepare_v2(db, "select maker from lensmaker", -1, &stmt, 0); + rc = sqlite3_prepare_v2(db, "select maker from lensmaker order by id", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Failed to fetch data: %s\n", sqlite3_errmsg(db)); + gchar* err = g_strdup_printf("Failed to fetch data: %s\n", sqlite3_errmsg(db)); + fprintf(stderr, err); + show_err_msg(GTK_MESSAGE_ERROR, err); + g_free(err); return NULL; } @@ -290,14 +413,20 @@ gint get_maker_id(const gchar* maker) { rc = sqlite3_prepare_v2(db, "select id from lensmaker where maker = ?1", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); + 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 -1; } rc = sqlite3_bind_text(stmt, 1, maker, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return -1; } @@ -324,14 +453,20 @@ GSList* get_lens_by_maker(gint id) { rc = sqlite3_prepare_v2(db, "select sn, description, notes, id from lens where maker = ?1", -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); + 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 NULL; } rc = sqlite3_bind_int64(stmt, 1, id); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return NULL; } @@ -378,7 +513,10 @@ GSList* get_lens_by_search(const Row* row) { rc = sqlite3_prepare_v2(db, sql, -1, &stmt, 0); if (rc != SQLITE_OK) { - fprintf(stderr, "Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); + 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 NULL; } @@ -386,7 +524,10 @@ GSList* get_lens_by_search(const Row* row) { if (bind1) { rc = sqlite3_bind_text(stmt, 1, bind1, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return NULL; } @@ -395,7 +536,10 @@ GSList* get_lens_by_search(const Row* row) { if (bind2) { rc = sqlite3_bind_text(stmt, 2, bind2, -1, NULL); if (rc) { - fprintf(stderr, "Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + 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); + g_free(err); sqlite3_finalize(stmt); return NULL; } diff --git a/src/sqlite-storage.h b/src/sqlite-storage.h index 4a886b5..cc4790e 100644 --- a/src/sqlite-storage.h +++ b/src/sqlite-storage.h @@ -50,7 +50,7 @@ gint init_storage(const gchar* path); void close_storage(); gint add_lens(const Row* row); gint update_lens(const Row* row); -gint add_maker(const gchar* maker); +gint add_maker(const gchar* maker, gchar** err); gint delete_maker(const gchar* maker); GSList* get_makers(); gint get_maker_id(const gchar* maker);