Changeset 16370

Timestamp:

05/12/08 22:35:03 (2 months ago)

Author:

piotras

Message:

Added safe functions to set correct and safe value in case of NULL values in DB

Files:

• branches/branch-1-8/src/core/midgard/src/query_builder.c (modified) (2 diffs)

branches/branch-1-8/src/core/midgard/src/query_builder.c

@@ -637 +637 @@
-}
-
+static void __safe_string_from_field(GValue *val, gchar *row)
+{
+        if(row == NULL)
+                g_value_set_string(val, "");
+        else 
+                g_value_set_string(val, row);
+}
+
+static void __safe_uint_from_field(GValue *val, gchar *row)
+{
+        if(row == NULL)
+                g_value_set_uint(val, 0);
+        else 
+                g_value_set_uint(val, atoi(row));
+}
+
+static void __safe_int_from_field(GValue *val, gchar *row)
+{
+        if(row == NULL)
+                g_value_set_int(val, 0);
+        else 
+                g_value_set_int(val, atoi(row));
+}
+
+static void __safe_float_from_field(GValue *val, gchar *row)
+{
+        if(row == NULL)
+                g_value_set_float(val, 0.0000);
+        else 
+                g_value_set_float(val, g_ascii_strtod(row, NULL));
+}
+
+static void __safe_bool_from_field(GValue *val, gchar *row)
+{
+        if(row == NULL)
+                g_value_set_boolean(val, FALSE);
+        else 
+                g_value_set_boolean(val, atoi(row));
+}
+
-GList *_mqb_set_object_from_query(MidgardQueryBuilder *builder, guint select_type){
-
@@ -772 +812 @@
-
-                                        case G_TYPE_STRING:                             
-g_value_set_string
+__safe_string_from_field
-                                                break; 
-
-                                        case G_TYPE_UINT:
-                                                g_value_set_uint(&pval, atoi(row[j])
+                                               __safe_uint_from_field(&pval, (gchar *)row[j]
-                                                break;
-
-                                        case G_TYPE_INT:
-g_value_set_int(&pval, atoi(row[j])
+__safe_int_from_field(&pval, (gchar *)row[j]
-                                                break;
-
-                                        case G_TYPE_FLOAT:
-g_value_set_float(&pval, g_ascii_strtod(row[j], NULL)
-                                                
+__safe_float_from_field(&pval, (gchar *)row[j]
+                                               
-                                        
-                                        case G_TYPE_BOOLEAN:
-g_value_set_boolean(&pval, atoi(row[j])
-                                                
+__safe_bool_from_field(&pval, (gchar *)row[j]
+                                               
-                                                
-                                }