Loaded datasources.

Enabled first argument of command line as connection string.

diff --git a/data/audit-gui/gui/audit-gui.gui b/data/audit-gui/gui/audit-gui.gui
index 1b02b8d7da07ab77e455a8a8607f7d24af4b3f04..9f4412f745a109fcf04b9b131cc65a7a2a2bcfd1 100644 (file)
--- a/data/audit-gui/gui/audit-gui.gui
+++ b/data/audit-gui/gui/audit-gui.gui
@@ -376,6 +376,8 @@
       <column type="gchararray"/>
       <!-- column-name choosen -->
       <column type="gboolean"/>
+      <!-- column-name choosen_visible -->
+      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkWindow" id="w_datasources">
@@ -443,6 +445,7 @@
                     <child>
                       <object class="GtkCellRendererToggle" id="cellrenderertoggle2"/>
                       <attributes>
+                        <attribute name="visible">8</attribute>
                         <attribute name="activatable">7</attribute>
                       </attributes>
                     </child>

diff --git a/src/commons.h b/src/commons.h
index cc395df7ffe3b3f5477213b777194cfa80cdf79a..4b80e0bfd615db00a953a104a77c34a183e82120 100644 (file)
--- a/src/commons.h
+++ b/src/commons.h
@@ -35,6 +35,7 @@ typedef struct
                GtkBuilder *gtkbuilder;
 
                GdaConnection *gdacon;
+               GdaSqlParser *gdaparser;
        } Commons;
 
 #endif /* __COMMONS_H__ */

diff --git a/src/datasources.c b/src/datasources.c
index 2203b102cf8733fa98bcc248d4242eb31694500b..bcaede730f8e37462ce7533baff26d9849cf240d 100644 (file)
--- a/src/datasources.c
+++ b/src/datasources.c
@@ -17,6 +17,8 @@
  *
  */
 
+#include <sql-parser/gda-sql-parser.h>
+
 #include "datasources.h"
 
 static void datasources_class_init (DatasourcesClass *klass);
@@ -51,8 +53,9 @@ static void datasources_on_trv_datasources_row_activated (GtkTreeView *tree_view
 
 enum
 {
-       COL_ID,
-       COL_NOME
+       COL_ID_DS,
+       COL_NAME_DS,
+       COL_CNCSTRING_DS
 };
 
 typedef struct _DatasourcesPrivate DatasourcesPrivate;
@@ -148,7 +151,12 @@ GtkWidget
 static void
 datasources_load (Datasources *datasources)
 {
-       /*GtkTreeIter iter;
+       GtkTreeIter iter;
+
+       gchar *sql;
+
+       GdaStatement *stmt;
+       GError *error;
        GdaDataModel *dm;
 
        gint rows;
@@ -156,28 +164,32 @@ datasources_load (Datasources *datasources)
 
        DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources);
 
-       gtk_list_store_clear (priv->lstore_datasources);
+       gtk_tree_store_clear (priv->tstore_datasources);
 
-       dm = gdaex_query (priv->commons->gdaex,
-                         "SELECT c.id, c.nome"
-                         " FROM datasources AS c"
-                         " WHERE c.status <> 'E'"
-                         " ORDER BY c.nome");
+       sql = g_strdup_printf ("SELECT id, name, cnc_string FROM datasources WHERE status <> 'D'");
+       stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, NULL);
+       dm = gda_connection_statement_execute_select (priv->commons->gdacon, stmt, NULL, &error);
+       g_object_unref (stmt);
        if (dm != NULL)
                {
                        rows = gda_data_model_get_n_rows (dm);
                        for (row = 0; row < rows; row++)
                                {
-                                       gtk_list_store_append (priv->lstore_datasources, &iter);
+                                       gtk_tree_store_append (priv->tstore_datasources, &iter, NULL);
 
-                                       gtk_list_store_set (priv->lstore_datasources, &iter,
-                                                           COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
-                                                           COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
+                                       gtk_tree_store_set (priv->tstore_datasources, &iter,
+                                                           COL_ID_DS, g_value_get_int (gda_data_model_get_value_at (dm, 0, row, NULL)),
+                                                           COL_NAME_DS, gda_value_stringify (gda_data_model_get_value_at (dm, 1, row, NULL)),
+                                                           COL_CNCSTRING_DS, g_strdup_printf ("(%s)", gda_value_stringify (gda_data_model_get_value_at (dm, 2, row, NULL))),
                                                            -1);
                                }
 
                        g_object_unref (dm);
-               }*/
+               }
+       else
+               {
+                       /* TODO */
+               }
 }
 
 static void

diff --git a/src/main.c b/src/main.c
index 252a3ffd74b7a13e6d129b14f99059dad7ec732a..968faf8ca8bab3df8e72e8d80bcaee2e6b91b320 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include <libgda/libgda.h>
-#include <libgda-ui/libgda-ui.h>
+#include <sql-parser/gda-sql-parser.h>
 
 #include "commons.h"
 #include "datasources.h"
@@ -67,13 +67,18 @@ main_on_ds_opened (gpointer instance, const gchar *arg1, gpointer user_data)
                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                         GTK_MESSAGE_WARNING,
                                                         GTK_BUTTONS_OK,
-                                                        "Unable to connect to the choosen audit db.\n\n%s",
+                                                        "Unable to connect to the choosen audit db.\n\n%s\n\n%s",
+                                                        arg1, 
                                                         (error != NULL && error->message != NULL ? error->message : "No details."));
                        gtk_dialog_run (GTK_DIALOG (dialog));
                        gtk_widget_destroy (dialog);
                        return;
                }
 
+       commons->gdaparser = gda_connection_create_parser (commons->gdacon);
+       if (!commons->gdaparser) /* @cnc doe snot provide its own parser => use default one */
+               commons->gdaparser = gda_sql_parser_new ();
+
        Datasources *m = datasources_new (commons);
 
        vbx = datasources_get_widget (m);
@@ -179,6 +184,12 @@ main (int argc, char *argv[])
 
        gtk_widget_show (w);
 
+       if (argc > 0)
+               {
+                       /* try to user the first argument of command line as a cnc_string */
+                       main_on_ds_opened (NULL, argv[1], NULL);
+               }
+
        gtk_main ();
 
        return 0;