Changeset 16723

Timestamp:

06/27/08 11:11:58 (4 months ago)

Author:

piotras

Message:

Added GError argument to read_file and save_file methods.

Files:

• trunk/midgard/core/midgard/src/midgard_config.c (modified) (9 diffs)
• trunk/midgard/core/midgard/src/midgard_config.h (modified) (2 diffs)
• trunk/midgard/core/midgard/src/midgard_connection.c (modified) (3 diffs)
• trunk/midgard/core/midgard/test/midgard-query.c (modified) (1 diff)
• trunk/midgard/core/midgard/test/midgard-schema.c (modified) (1 diff)

trunk/midgard/core/midgard/src/midgard_config.c

@@ -31 +31 @@
-#include "midgard_core_config.h"
-#include "midgard_connection.h"
+#include "midgard_error.h"
-
-#define AUTH_NORMAL_STR "Normal"
@@ -92 +93 @@
-{
-        static mdirs *iconf = NULL;
-GDir *dir;
+/* GDir *dir; */
-        
-        if (iconf != NULL) return iconf;
@@ -212 +213 @@
- * @filename: name of the file to read 
- * @user: boolean switch for system or user's config files
+ * @error: pointer to store error
- * 
- * This method reads configuration file from the given name and sets MidgardConfig object's properties.
@@ -223 +225 @@
- * Since: 1.9
- */ 
-
+, GError **error
-{
-        const mdirs *iconf;
@@ -230 +232 @@
-        GKeyFile *keyfile;      
-        gboolean tmpbool;
-        GError *error = NULL;
-
-        g_assert(self != NULL);
+        g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+        if(filename == NULL || *filename == '\0') {
+                
+                *error = g_error_new(MGD_GENERIC_ERROR, 
+                                MGD_ERR_INVALID_NAME, 
+                                "Configuration name can not be empty");
+                return FALSE;
+        }
-        
-        if ((iconf = _midgard_core_config_get_config_dirs()) == NULL)
@@ -247 +257 @@
-        }
-
+        GError *kf_error = NULL;
-        keyfile = g_key_file_new();
-        if (!g_key_file_load_from_file (
-
-
-
+
+
+
+
+
+
-                g_free(fname);
-                return FALSE;
@@ -522 +536 @@
- */
-gboolean midgard_config_save_file(MidgardConfig *self,
-
+, GError **error
-{
-        g_return_val_if_fail(self != NULL, FALSE);
@@ -658 +672 @@
-
-        gsize length;
-
+kf_
-        
-        gchar *content = g_key_file_to_data(self->private->keyfile,
-
+kf_
-
-        if(length < 1) {
-warning("%s", error->message
-
+propagate_error(error, kf_error
+kf_
-                return FALSE;
-        }
-
-
+
+
-
-        gboolean saved = g_file_set_contents(cnfpath, 
-
+kf_
-
-        if(!saved) {
-warning("%s", error->message
-
+propagate_error(error, kf_error
+kf_
-                return FALSE;
-        }
-
-MIDGARD_I
+G_O
-        /* TODO , implement WIN32 */
-#else 
-        g_chmod(cnfpath, 0600);
-MIDGARD_I
+G_O
-
-        return TRUE;
@@ -801 +816 @@
-}
-
-
-
-MidgardConnection *midgard_config_init(const gchar *filename)
-{
-        MidgardConnection *mgd = midgard_connection_new();
-
-        if(!mgd)
-                g_error("Can not initialize midgard_connection object");
-
-        MidgardConfig *config = g_object_new(MIDGARD_TYPE_CONFIG, NULL);
-        
-        if(!midgard_config_read_file(config, (const gchar *)filename, TRUE)){
-                g_object_unref(mgd);
-                g_object_unref(config);
-                return NULL;
-        }
-
-        if(!midgard_connection_open_config(mgd, config)){
-                g_object_unref(mgd);
-                g_object_unref(config); 
-                return NULL;
-        }
-
-        /*
-        g_log_set_handler(G_LOG_DOMAIN, G_LOG_LEVEL_MASK,
-                        mgd_log_debug_default,
-                        (gpointer)midgard_connection_get_loglevel(mgd));
-        g_log_set_handler("midgard-core", G_LOG_LEVEL_MASK,
-                        mgd_log_debug_default,
-                        (gpointer)midgard_connection_get_loglevel(mgd));
-        g_log_set_handler("midgard-core-type", G_LOG_LEVEL_MASK,
-                        mgd_log_debug_default,
-                        (gpointer)midgard_connection_get_loglevel(mgd));
-                        */
-
-        return mgd;
-}
-
-/* !! Undocumented workarounds !! */

trunk/midgard/core/midgard/src/midgard_config.h

@@ -95 +95 @@
-        /* class members */
-        gboolean (*read_config) (MidgardConfig *self, 
-
+, GError **error
-        gboolean (*save_config) (MidgardConfig *self,
-
+, GError **error
-        gchar (**list_files) (gboolean user);
-        gboolean (*create_midgard_tables)(MidgardConfig *self,
@@ -120 +120 @@
-} MidgardDBType;
-
-extern 
+
-
-extern 
+
-
-extern 
-
+
+, GError **error
-
-extern 
+
-
-extern 
-
+
+, GError **error
-
-extern 
+
-                                MidgardConnection *mgd);
-
-extern 
+
-                                MidgardObjectClass *klass, MidgardConnection *mgd);
-

trunk/midgard/core/midgard/src/midgard_connection.c

@@ -823 +823 @@
-        
-        MidgardConfig *config = midgard_config_new();
-
+
+
+
-                return FALSE;
-        
@@ -862 +864 @@
-        guint i = 0;
-        
+        GError *error = NULL;
+
-        while(cfgs[i] != NULL) {
-                
@@ -868 +872 @@
-                
-                MidgardConfig *config = midgard_config_new();
-
+, &error
-                        g_warning("Can not open %s configuration", cfgs[i]);
-

trunk/midgard/core/midgard/test/midgard-query.c

@@ -77 +77 @@
-                        cts = TRUE;
-        }
-
-
+
+
+
+
+
+
+
-                return 1;
+        }
-        
-        if(!midgard_connection_open_config(mgd, config)) 

trunk/midgard/core/midgard/test/midgard-schema.c

@@ -169 +169 @@
-        MidgardConfig *config = g_object_new(MIDGARD_TYPE_CONFIG, NULL);
-
-
+
+
+
+
+
+
+
+
-                return 1;
+        }
-
-        /* open config using class member method or function