From 727aa8abb91ee9c2a085a8bcc5332625efbd6c53 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 15 Aug 2010 10:22:37 +0200 Subject: [PATCH] Added anjuta project. Added prefix for tables names. Removed libaudit systems tables from tables chooser. --- TODO.tasks | 6 ++++ audit-gui.anjuta | 51 ++++++++++++++++++++++++++++++++ data/audit-gui/gui/audit-gui.gui | 39 +++++++++++++++++++++--- src/commons.h | 2 ++ src/main.c | 20 +++++++++++-- src/openauditds.c | 6 ++-- src/table.c | 36 +++++++++++++++++++--- 7 files changed, 148 insertions(+), 12 deletions(-) create mode 100644 TODO.tasks create mode 100644 audit-gui.anjuta diff --git a/TODO.tasks b/TODO.tasks new file mode 100644 index 0000000..5e3fea0 --- /dev/null +++ b/TODO.tasks @@ -0,0 +1,6 @@ + + + + + + diff --git a/audit-gui.anjuta b/audit-gui.anjuta new file mode 100644 index 0000000..68c60e6 --- /dev/null +++ b/audit-gui.anjuta @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/audit-gui/gui/audit-gui.gui b/data/audit-gui/gui/audit-gui.gui index 89ebe2d..6bacfac 100644 --- a/data/audit-gui/gui/audit-gui.gui +++ b/data/audit-gui/gui/audit-gui.gui @@ -152,6 +152,37 @@ 5 vertical 5 + + + True + 5 + + + True + 0 + Table name prefix + + + False + 0 + + + + + True + True + ● + + + 1 + + + + + False + 0 + + @@ -191,7 +222,7 @@ False - 1 + 2 @@ -434,9 +465,6 @@ GTK_FILL - - - True @@ -456,6 +484,9 @@ GTK_FILL + + + False diff --git a/src/commons.h b/src/commons.h index 4b80e0b..28dc0f1 100644 --- a/src/commons.h +++ b/src/commons.h @@ -36,6 +36,8 @@ typedef struct GdaConnection *gdacon; GdaSqlParser *gdaparser; + + gchar *prefix; } Commons; #endif /* __COMMONS_H__ */ diff --git a/src/main.c b/src/main.c index f0d2dba..c170750 100644 --- a/src/main.c +++ b/src/main.c @@ -59,8 +59,24 @@ main_on_ds_opened (gpointer instance, const gchar *arg1, gpointer user_data) GtkWidget *vbx; GError *error; + gchar *cnc; + + gchar *pos; + + cnc = g_strdup (arg1); + pos = g_strrstr (cnc, "{prefix}"); + if (pos != NULL) + { + cnc = g_strndup (cnc, pos - cnc); + commons->prefix = g_strdup (pos + 8); + } + else + { + commons->prefix = g_strdup (""); + } + error = NULL; - commons->gdacon = gda_connection_open_from_string (NULL, arg1, NULL, + commons->gdacon = gda_connection_open_from_string (NULL, cnc, NULL, GDA_CONNECTION_OPTIONS_NONE, &error); if (!commons->gdacon) @@ -153,7 +169,7 @@ main (int argc, char *argv[]) gda_init (); /* inizializzazione commons */ - commons = g_malloc (sizeof (Commons)); + commons = g_malloc0 (sizeof (Commons)); #ifdef G_OS_WIN32 diff --git a/src/openauditds.c b/src/openauditds.c index e55a252..f3499d5 100644 --- a/src/openauditds.c +++ b/src/openauditds.c @@ -230,8 +230,10 @@ open_audit_ds_on_btn_open_clicked (GtkButton *button, info = gdaui_login_get_connection_information (GDAUI_LOGIN (priv->wlogin)); cncstring = g_strconcat (info->provider, "://", - (info->auth_string != NULL ? g_strdup_printf ("%s;", info->auth_string) : ""), - info->cnc_string, NULL); + (info->auth_string != NULL ? g_strdup_printf ("%s;", info->auth_string) : ""), + info->cnc_string, + "{prefix}", gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry2"))), + NULL); g_signal_emit (open_audit_ds, klass->opened_signal_id, 0, cncstring); diff --git a/src/table.c b/src/table.c index d2c3ab7..c9eddef 100644 --- a/src/table.c +++ b/src/table.c @@ -172,6 +172,27 @@ GtkWidget } /* PRIVATE */ +static gboolean +table_is_a_system_table (Table *table, const gchar *table_name) +{ + gboolean ret; + + gchar *real_table_name; + + TablePrivate *priv = TABLE_GET_PRIVATE (table); + + real_table_name = g_strstrip (g_strdelimit (g_strdup (table_name), "\"`", ' ')); + + ret = g_strcmp0 (real_table_name, g_strdup_printf ("%sdatasources", priv->commons->prefix)) == 0 + || g_strcmp0 (real_table_name, g_strdup_printf ("%stables", priv->commons->prefix)) == 0 + || g_strcmp0 (real_table_name, g_strdup_printf ("%sfields", priv->commons->prefix)) == 0 + || g_strcmp0 (real_table_name, g_strdup_printf ("%sactions", priv->commons->prefix)) == 0 + || g_strcmp0 (real_table_name, g_strdup_printf ("%svalues", priv->commons->prefix)) == 0; + g_free (real_table_name); + + return ret; +} + static void table_load_db_tables (Table *table) { @@ -187,6 +208,8 @@ table_load_db_tables (Table *table) guint rows; guint row; + gchar *table_name; + TablePrivate *priv = TABLE_GET_PRIVATE (table); error = NULL; @@ -218,10 +241,15 @@ table_load_db_tables (Table *table) rows = gda_data_model_get_n_rows (dm); for (row = 0; row < rows; row++) { - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, NULL)), - -1); + table_name = gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, NULL)); + + if (!table_is_a_system_table (table, table_name)) + { + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, table_name, + -1); + } } } } -- 2.49.0