gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ag_db_get_chart_data_by_id() to recognise NULL values

Browse Source
This commit is contained in:
Gergely Polonkai 2014-08-19 00:29:21 +02:00
parent 1c2c2d0342
commit 8d82c48f5f
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ag-db.c
View File

@ -857,7 +857,6 @@ ag_db_get_chart_data_by_id(AgDb *db, guint row_id, GError **err)
{ {
AgDbSave *save_data; AgDbSave *save_data;
const GValue *value; const GValue *value;
GdaValueAttribute attributes;
gchar *query, gchar *query,
*columns; *columns;
guint i; guint i;
@ -918,18 +917,16 @@ ag_db_get_chart_data_by_id(AgDb *db, guint row_id, GError **err)
/* country */ /* country */
value = gda_data_model_get_value_at(result, COLUMN_COUNTRY, 0, NULL); value = gda_data_model_get_value_at(result, COLUMN_COUNTRY, 0, NULL);
attributes = gda_data_model_get_attributes_at(result, COLUMN_COUNTRY, 0);
if (attributes | GDA_VALUE_ATTR_IS_NULL) { if (GDA_VALUE_HOLDS_NULL(value)) {
save_data->country = NULL; save_data->country = NULL;
} else { } else {
save_data->country = g_strdup(g_value_get_string(value)); save_data->country = g_strdup(g_value_get_string(value));
} }
value = gda_data_model_get_value_at(result, COLUMN_CITY, 0, NULL); value = gda_data_model_get_value_at(result, COLUMN_CITY, 0, NULL);
attributes = gda_data_model_get_attributes_at(result, COLUMN_CITY, 0);
if (attributes | GDA_VALUE_ATTR_IS_NULL) { if (GDA_VALUE_HOLDS_NULL(value)) {
save_data->city = NULL; save_data->city = NULL;
} else { } else {
save_data->city = g_strdup(g_value_get_string(value)); save_data->city = g_strdup(g_value_get_string(value));
@ -952,9 +949,8 @@ ag_db_get_chart_data_by_id(AgDb *db, guint row_id, GError **err)
save_data->latitude = g_value_get_double(value); save_data->latitude = g_value_get_double(value);
value = gda_data_model_get_value_at(result, COLUMN_ALTITUDE, 0, NULL); value = gda_data_model_get_value_at(result, COLUMN_ALTITUDE, 0, NULL);
attributes = gda_data_model_get_attributes_at(result, COLUMN_ALTITUDE, 0);
if (attributes | GDA_VALUE_ATTR_IS_NULL) { if (GDA_VALUE_HOLDS_NULL(value)) {
save_data->altitude = DEFAULT_ALTITUDE; save_data->altitude = DEFAULT_ALTITUDE;
} else { } else {
save_data->altitude = g_value_get_double(value); save_data->altitude = g_value_get_double(value);
@ -1010,9 +1006,8 @@ ag_db_get_chart_data_by_id(AgDb *db, guint row_id, GError **err)
save_data->house_system = g_strdup(g_value_get_string(value)); save_data->house_system = g_strdup(g_value_get_string(value));
value = gda_data_model_get_value_at(result, COLUMN_NOTE, 0, NULL); value = gda_data_model_get_value_at(result, COLUMN_NOTE, 0, NULL);
attributes = gda_data_model_get_attributes_at(result, 15, 0);
if (attributes | GDA_VALUE_ATTR_IS_NULL) { if (GDA_VALUE_HOLDS_NULL(value)) {
save_data->note = NULL; save_data->note = NULL;
} else { } else {
save_data->note = g_strdup(g_value_get_string(value)); save_data->note = g_strdup(g_value_get_string(value));