Added anjuta project.

Added prefix for tables names.
Removed libaudit systems tables from tables chooser.

diff --git a/TODO.tasks b/TODO.tasks
new file mode 100644 (file)
index 0000000..5e3fea0
--- /dev/null
+++ b/TODO.tasks
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<gtodo>
+  <category title="Personale" place="0"/>
+  <category title="Affari" place="1"/>
+  <category title="Non classificati" place="2"/>
+</gtodo>

diff --git a/audit-gui.anjuta b/audit-gui.anjuta
new file mode 100644 (file)
index 0000000..68c60e6
--- /dev/null
+++ b/audit-gui.anjuta
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<anjuta>
+       <plugin name="GBF Project Manager"
+            url="http://anjuta.org/plugins/"
+            mandatory="yes">
+               <require group="Anjuta Plugin"
+                 attribute="Interfaces"
+                 value="IAnjutaProjectManager"/>
+       </plugin>
+       <plugin name="AutoTools Project Backend"
+            url="http://anjuta.org/plugins/"
+            mandatory="yes">
+               <require group="Anjuta Plugin"
+                 attribute="Interfaces"
+                 value="IAnjutaProjectBackend"/>
+               <require group="Project"
+                 attribute="Supported-Project-Types"
+                 value="automake"/>
+       </plugin>
+       <plugin name="Symbol Browser"
+            url="http://anjuta.org/plugins/"
+            mandatory="yes">
+               <require group="Anjuta Plugin"
+                 attribute="Interfaces"
+                 value="IAnjutaSymbolManager"/>
+       </plugin>
+       <plugin name="Make Build System"
+            url="http://anjuta.org/plugins/"
+            mandatory="yes">
+               <require group="Anjuta Plugin"
+                 attribute="Interfaces"
+                 value="IAnjutaBuildable"/>
+               <require group="Build"
+                 attribute="Supported-Build-Types"
+                 value="make"/>
+       </plugin>
+       <plugin name="Task Manager"
+            url="http://anjuta.org/plugins/"
+            mandatory="no">
+               <require group="Anjuta Plugin"
+                 attribute="Interfaces"
+                 value="IAnjutaTodo"/>
+       </plugin>
+       <plugin name="Debug Manager"
+            url="http://anjuta.org/plugins/"
+            mandatory="no">
+               <require group="Anjuta Plugin"
+                 attribute="Interfaces"
+                 value="IAnjutaDebugManager"/>
+       </plugin>
+</anjuta>

diff --git a/data/audit-gui/gui/audit-gui.gui b/data/audit-gui/gui/audit-gui.gui
index 89ebe2d7509612b9c4c34584eb87f23804f2b6ca..6bacfac78b73a9eebd3f6225d187ba4ac43f6cf2 100644 (file)
--- a/data/audit-gui/gui/audit-gui.gui
+++ b/data/audit-gui/gui/audit-gui.gui
@@ -152,6 +152,37 @@
         <property name="border_width">5</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Table name prefix</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <placeholder/>
         </child>
@@ -191,7 +222,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -434,9 +465,6 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
             <child>
               <object class="GtkComboBox" id="combobox1">
                 <property name="visible">True</property>
@@ -456,6 +484,9 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>

diff --git a/src/commons.h b/src/commons.h
index 4b80e0bfd615db00a953a104a77c34a183e82120..28dc0f13136e3581afb1c1d2f9a7f90c2f1d5cdc 100644 (file)
--- 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 f0d2dba713020847757bfb192f61851111b8f477..c17075037c54ad232da2d6cea50dcf6e3a5a0512 100644 (file)
--- 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 e55a252bd19de225a89cf596e32d0117dd78c35d..f3499d518f37afcb9671c5a4a69c5ee187f8499a 100644 (file)
--- 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 d2c3ab77f51e38b95e7c91311e13df361aec4224..c9eddef8033424896956552588073a3f43329e27 100644 (file)
--- 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);
+                                               }
                                }
                }
 }