Changeset 16255

Timestamp:

04/28/08 09:12:26 (7 months ago)

Author:

piotras

Message:

Removed GHashTable parameter usage from open methods.
Implemented this one internally for open_all.
Added open_all method.
Added private flag to free config.

Files:

• trunk/midgard/core/midgard/src/midgard_config.c (modified) (1 diff)
• trunk/midgard/core/midgard/src/midgard_connection.c (modified) (11 diffs)
• trunk/midgard/core/midgard/src/midgard_connection.h (modified) (3 diffs)
• trunk/midgard/core/midgard/src/midgard_core_object.h (modified) (1 diff)
• 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

@@ -827 +827 @@
-        }
-
-
-
+
-                g_object_unref(mgd);
-
-
+
-                return NULL;
-        }
-        if(hash) g_hash_table_destroy(hash);
-
-        /*

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

@@ -142 +142 @@
-        
-        cnc_private->config = NULL;
+        cnc_private->free_config = FALSE;
-        cnc_private->loghandler = 0;
-        cnc_private->loglevel = 0;
@@ -231 +232 @@
-                        g_free(self->priv->cache);
-                        self->priv->cache = NULL;
+                }
+
+                if(self->priv->free_config) {
+                        g_object_unref(self->priv->config);
+                        self->priv->config = NULL;
+                        self->priv->free_config = FALSE;
-                }
-
@@ -433 +440 @@
-        /* Private members */
-        self->priv = midgard_connection_private_new();
+        self->priv->free_config= FALSE;
-        self->priv->cache = NULL;
-        self->priv->user = NULL;
@@ -496 +504 @@
-}
-
+static void _to_close_cnc_callback(GdaConnection *cnc, 
+                GdaConnectionEvent *event, gpointer ud)
+{
+        g_warning("Midgard connection to close: %s, No:(%li), src:%s, SQL: %s",
+                        gda_connection_event_get_description(event),
+                        (long) gda_connection_event_get_code(event),
+                        gda_connection_event_get_source(event),
+                        gda_connection_event_get_sqlstate (event));
+}
+
+static void _closed_cnc_callback(GdaConnection *cnc, 
+                GdaConnectionEvent *event, gpointer ud)
+{
+        g_warning("Midgard CONNECTION CLOSED");
+}
-
-/**
@@ -731 +754 @@
-        g_signal_connect(G_OBJECT(connection), "error",
-                        G_CALLBACK(_connect_cnc_callback), (gpointer) mgd);
+        g_signal_connect(G_OBJECT(connection), "conn_to_close",
+                        G_CALLBACK(_to_close_cnc_callback), (gpointer) mgd);
+        g_signal_connect(G_OBJECT(connection), "conn_closed",
+                        G_CALLBACK(_closed_cnc_callback), (gpointer) mgd);
+
+
-
-        if(init_schema) {
@@ -789 +818 @@
- * @mgd: #MidgardConnection instance
- * @name: configuration file name
- * @hash: GHashTable table
- *
- * Opens a connection to the database defined in named configuration. 
@@ -802 +830 @@
- */ 
-gboolean midgard_connection_open(
-
-
+
-{       
-        g_assert(mgd != NULL);
@@ -822 +849 @@
-        
-        mgd->priv->config = config;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return FALSE;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -833 +921 @@
- * @self: [in]newly initialized #MidgardConnection object
- * @config: #MidgardConfig object
- * @hash: table to store reusable cache data
- *
- * Opens a #MidgardConnection with the given configuration. 
- *
- * Third @hash parameter usage is exactly the same as in 
- * midgard_connection_open function.
- *
- * Returns: %TRUE on success, %FALSE otherwise
- */
-gboolean midgard_connection_open_config(
-
-
+
-{
-        g_assert(self != NULL); 
@@ -850 +933 @@
-
-        self->priv->config = config;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-gboolean midgard_connection_struct_open_config(
-
-
+
-{
-        g_assert(self != NULL);
@@ -866 +953 @@
-        self->priv->config = config;
-        
-hashtable
+NULL
-                return FALSE;
-        

trunk/midgard/core/midgard/src/midgard_connection.h

@@ -50 +50 @@
-
-        /* class members */
-
-
-
-
+
+
-        void (*close) (MidgardConnection *mgd);
-        
@@ -106 +104 @@
-extern MidgardConnection *midgard_connection_new(void);
-
-
-
-
+
-
-gboolean midgard_connection_open_config(
-
-               GHashTable **hash
+GHashTable *midgard_connection_open_all(gboolean userdir); 
+
+extern gboolean midgard_connection_open_config(MidgardConnection *self, MidgardConfig *config
-
-extern void midgard_connection_close(MidgardConnection *self);
@@ -173 +169 @@
-
-extern gboolean midgard_connection_struct_open_config(
-
-
+
-
-extern void midgard_connection_workaround_set(MidgardConnection *mgd);

trunk/midgard/core/midgard/src/midgard_core_object.h

@@ -114 +114 @@
-struct _MidgardConnectionPrivate{
-        MidgardConfig *config;
+        gboolean free_config;
-        guint loghandler;
-        guint loglevel;

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

@@ -80 +80 @@
-        if(!midgard_config_read_file(config, (const gchar *)config_name, cts))
-                return 1;
-
-
-
-
-
-
-
+
+
+
-
-        //midgard_connection_set_loglevel(mgd, "warning");

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

@@ -176 +176 @@
-                                midgard, config))
-        */
-
-
-
+
-                return 1;       
-
-
-
+
-        guint n_types, i;
-        GType *all_types = g_type_children(MIDGARD_TYPE_OBJECT, &n_types);