static sqlite3* db = NULL;
static gchar* lensmaker = "create table lensmaker("
- "id integer primary key not null AUTOINCREMENT,"
+ "id integer not null,"
"maker text not null UNIQUE,"
- "page int DEFAULT -1);";
+ "page int DEFAULT -1,"
+ "PRIMARY KEY(id AUTOINCREMENT));";
static gchar* lens = "create table lens("
- "id integer primary key not null AUTOINCREMENT,"
+ "id integer not null,"
"sn text not null,"
"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)
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;
}
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;
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;
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);
}
return 0;
}
-gint add_lens(const Row* row) {
+gint add_lens(Row* row) {
gint rc;
sqlite3_stmt* stmt;
gint status = 1;
- rc = sqlite3_prepare_v2(db, "insert into lens (sn, maker, description, notes) values (?1, ?2, ?3, ?4)", -1, &stmt, 0);
+ rc = sqlite3_prepare_v2(db, "insert into lens (sn, maker, description, notes) values (?1, ?2, ?3, ?4) 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);
sqlite3_finalize(stmt);
return status;
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;
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;
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;
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;
}
rc = sqlite3_step(stmt);
- if (rc != SQLITE_DONE) {
+ 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);
status = 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);
sqlite3_finalize(stmt);
return status;
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;
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;
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;
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;
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;
return status;
}
-gint add_maker(const gchar* maker, gchar** error) {
+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;
+ }
+
+ sqlite3_finalize(stmt);
+
+ return status;
+}
+
+gint delete_lens(const Row* row) {
gint rc;
sqlite3_stmt* stmt;
gint status = 1;
- rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1)", -1, &stmt, 0);
+ rc = sqlite3_prepare_v2(db, "delete from lens where id = ?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_message(GTK_MESSAGE_ERROR, err);
+ g_free(err);
+ sqlite3_finalize(stmt);
+ return status;
+ }
+
+ rc = sqlite3_bind_int64(stmt, 1, 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;
+ }
+
+ sqlite3_finalize(stmt);
+
+ return status;
+}
+
+gint add_maker(const gchar* maker, gchar** error) {
+ gint rc;
+ sqlite3_stmt* stmt;
+ 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_OK) {
- 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);
+ show_message(GTK_MESSAGE_ERROR, err);
g_free(err);
if (error)
*error = g_strdup(sqlite3_errmsg(db));
- sqlite3_finalize(stmt);
- return status;
- }
-
- status = 0;
+ } else {
+ id = sqlite3_column_int64(stmt, 0);
+ }
+
sqlite3_finalize(stmt);
- return status;
+ return id;
}
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;
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;
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;
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;
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;
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);
}
}
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) {
- gint status = 1;
+gint delete_maker(const gchar* maker, gchar** error) {
+ gint rc;
+ sqlite3_stmt* stmt;
+ gint status = 0;
+
+ gint id = get_maker_id(maker);
+ rc = sqlite3_prepare_v2(db, "delete from lensmaker where id = ?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_message(GTK_MESSAGE_ERROR, err);
+ g_free(err);
+ if (error)
+ *error = g_strdup(sqlite3_errmsg(db));
+ sqlite3_finalize(stmt);
+
+ return 1;
+ }
+
+ rc = sqlite3_bind_int(stmt, 1, 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);
+ if (error)
+ *error = g_strdup(sqlite3_errmsg(db));
+ sqlite3_finalize(stmt);
+
+ return 1;
+ }
+ //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_message(GTK_MESSAGE_ERROR, err);
+ g_free(err);
+ if (error)
+ *error = g_strdup(sqlite3_errmsg(db));
+ sqlite3_finalize(stmt);
+
+ status = 1;
+ }
+
+ sqlite3_finalize(stmt);
+
return status;
}
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;
}
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) {
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;
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;
return id;
}
-gint delete_lens(const Row* row) {
- gint status = 1;
-
- return status;
-}
-
GSList* get_lens_by_maker(gint id) {
gint rc;
sqlite3_stmt* stmt;
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;
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;
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;
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;
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;
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);
+}
+
+