Other tiny changes.

diff --git a/src/audit.c b/src/audit.c
index 7984a34d29b27395ebbb8d39cba75c97f4c732e0..3fb17ba67af9957585b16426e9fcc7c1d914d0ab 100644 (file)
--- a/src/audit.c
+++ b/src/audit.c
@@ -46,7 +46,7 @@ struct _AuditPrivate
        GdaEx *gdaex;
        GList *datasources;
 
-       GHashTable *campi_upd;
+       GHashTable *fields_updated;
 };
 
 typedef struct
@@ -91,7 +91,7 @@ audit_init (Audit *audit)
        AuditPrivate *priv = AUDIT_GET_PRIVATE (audit);
 
        priv->datasources = NULL;
-       priv->campi_upd = NULL;
+       priv->fields_updated = NULL;
 }
 
 static Audit
@@ -122,7 +122,7 @@ load_fields (Audit *audit,
 
        if (dm == NULL)
                {
-                       g_warning ("Per la table \"%s\" non sono stati configurati i fields.",
+                       g_warning ("For table \"%s\" fields have not been configured.",
                                   table->name);
                        return FALSE;
                }
@@ -130,7 +130,7 @@ load_fields (Audit *audit,
        rows = gda_data_model_get_n_rows (dm);
        if (rows == 0)
                {
-                       g_warning ("Per la table \"%s\" non sono stati configurati i fields.",
+                       g_warning ("For table \"%s\" fields have not been configured.",
                                   table->name);
                        return FALSE;
                }
@@ -166,7 +166,7 @@ load_tables (Audit *audit,
 
        if (dm == NULL)
                {
-                       g_warning ("Per il datasource \"%d\" non sono state configurate le tables.",
+                       g_warning ("For datasource \"%d\" tables have not been configured.",
                                   datasource->id);
                        return FALSE;
                }
@@ -174,7 +174,7 @@ load_tables (Audit *audit,
        rows = gda_data_model_get_n_rows (dm);
        if (rows == 0)
                {
-                       g_warning ("Per il datasource \"%d\" non sono state configurate le tables.",
+                       g_warning ("For datasource \"%d\" tables have not been configured.",
                                   datasource->id);
                        return FALSE;
                }
@@ -212,14 +212,14 @@ load_datasources (Audit *audit)
                                        " WHERE status <> 'D'");
        if (dm == NULL)
                {
-                       g_warning ("Non ci sono datasource configurati.");
+                       g_warning ("There are no datasources configured.");
                        return FALSE;
                }
 
        rows = gda_data_model_get_n_rows (dm);
        if (rows == 0)
                {
-                       g_warning ("Non ci sono datasource configurati.");
+                       g_warning ("There are no datasources configured.");
                        return FALSE;
                }
 
@@ -244,7 +244,7 @@ load_datasources (Audit *audit)
 }
 
 static Field
-*get_campo_from_nome (Audit *audit,
+*get_campo_from_name (Audit *audit,
                       Table *table,
                       const char *field)
 {
@@ -264,7 +264,7 @@ static Field
 }
 
 static Table
-*get_tabella_from_nome (Audit *audit,
+*get_tabella_from_name (Audit *audit,
                         Datasource *datasource,
                         const char *table)
 {
@@ -284,7 +284,7 @@ static Table
 }
 
 static Datasource
-*get_datasource_from_nome (Audit *audit,
+*get_datasource_from_name (Audit *audit,
                            const char *datasource)
 {
        GList *f = g_list_first (audit->datasources);
@@ -306,18 +306,18 @@ static gboolean
 insert_value (Audit *audit,
               gint id_azione,
               Table *table,
-              gchar *nome_campo,
+              gchar *field_name,
               gchar *value)
 {
        gchar *sql;
 
        AuditPrivate *priv = AUDIT_GET_PRIVATE (audit);
 
-       Field *field = get_campo_from_nome (audit, table, nome_campo);
+       Field *field = get_campo_from_name (audit, table, field_name);
        if (field == NULL)
                {
-                       g_warning ("Impossibile trovare il field \"%s\" nei fields caricati",
-                                  nome_campo);
+                       g_warning ("Unable to find the field \"%s\" on loaded fields.",
+                                  field_name);
                }
        else
                {
@@ -439,16 +439,16 @@ gboolean
 audit_action (Audit *audit,
               enum AuditActions action,
               const gchar *dn,
-              const gchar *nome_datasource,
-              const gchar *nome_tabella,
+              const gchar *datasource_name,
+              const gchar *table_name,
               ...)
 {
        GdaDataModel *dm;
        gchar *sql;
        gchar *sql_where;
-       gchar *nome_campo;
+       gchar *field_name;
        gchar *value;
-       gchar *valore_new;
+       gchar *value_new;
        gint id = 0;
        gint cols;
        gint col;
@@ -460,8 +460,14 @@ audit_action (Audit *audit,
 
        AuditPrivate *priv = AUDIT_GET_PRIVATE (audit);
 
+       if (action < 1)
+               {
+                       g_warning ("Action %d not valid.", action);
+                       return;
+               }
+
        /* trovo il nuovo id azione */
-       dm = gdaex_query (priv->gdaex, "SELECT COALESCE(MAX(id), 0) FROM actions");
+       dm = gdaex_query (priv->gdaex, "SELECT COALESCE (MAX (id), 0) FROM actions");
 
        if (dm != NULL && gda_data_model_get_n_rows (dm) == 1)
                {
@@ -474,20 +480,20 @@ audit_action (Audit *audit,
        tm_ora = localtime (&t);
 
        /* trovo il datasource */
-       datasource = get_datasource_from_nome (audit, nome_datasource);
+       datasource = get_datasource_from_name (audit, datasource_name);
        if (datasource == NULL)
                {
-                       g_warning ("Impossibile trovare il datasource \"%s\" nei datasource caricati",
-                                  nome_datasource);
+                       g_warning ("Unable to find the datasource \"%s\" on loaded datasources.",
+                                  datasource_name);
                        return FALSE;
                }
 
        /* trovo la table */
-       table = get_tabella_from_nome (audit, datasource, nome_tabella);
+       table = get_tabella_from_name (audit, datasource, table_name);
        if (table == NULL)
                {
-                       g_warning ("Impossibile trovare la table \"%s\" nelle tables caricate",
-                                  nome_tabella);
+                       g_warning ("Unable to find the table \"%s\" on loaded tables.",
+                                  table_name);
                        return FALSE;
                }
 
@@ -497,7 +503,7 @@ audit_action (Audit *audit,
                        sql = g_strdup_printf ("INSERT INTO actions"
                                               " (id, type, dn, date, id_tables, id_datasources)"
                                               " VALUES (%d, %d, '%s', '%04d-%02d-%02d %02d:%02d:%02d', %d, %d)",
-                                              id, action + 1, dn,
+                                              id, action, dn,
                                               tm_ora->tm_year + 1900, tm_ora->tm_mon + 1, tm_ora->tm_mday,
                                               tm_ora->tm_hour, tm_ora->tm_min, tm_ora->tm_sec,
                                               table->id, datasource->id);
@@ -505,24 +511,24 @@ audit_action (Audit *audit,
                }
 
        /* fields */
-       va_start (vargs, nome_tabella);
+       va_start (vargs, table_name);
 
        switch (action)
                {
                        case AUDIT_ACTION_INSERT:
                                /* salvo tutti i fields */
                                sql = g_strdup_printf ("SELECT * FROM %s",
-                                                      nome_tabella);
+                                                      table_name);
 
                                sql_where = g_strdup (" WHERE TRUE");
-                               nome_campo = va_arg (vargs, gchar *);
-                               while (nome_campo != NULL)
+                               field_name = va_arg (vargs, gchar *);
+                               while (field_name != NULL)
                                        {
                                                value = va_arg (vargs, gchar *);
                                                if (value == NULL) break;
 
-                                               sql_where = g_strconcat (sql_where, " AND ", nome_campo, "='", value, "'", NULL);
-                                               nome_campo = va_arg (vargs, gchar *);
+                                               sql_where = g_strconcat (sql_where, " AND ", field_name, "='", value, "'", NULL);
+                                               field_name = va_arg (vargs, gchar *);
                                        }
                                sql = g_strconcat (sql, sql_where, NULL);
                                dm = gdaex_query (datasource->gdaex, sql);
@@ -535,8 +541,8 @@ audit_action (Audit *audit,
                                for (col = 0; col < cols; col++)
                                        {
                                                /* trovo il field */
-                                               nome_campo = (gchar *)gda_data_model_get_column_title (dm, col);
-                                               insert_value (audit, id, table, nome_campo,
+                                               field_name = (gchar *)gda_data_model_get_column_title (dm, col);
+                                               insert_value (audit, id, table, field_name,
                                                              gdaex_data_model_get_value_stringify_at (dm, col, 0));
                                        }
                                break;
@@ -544,17 +550,17 @@ audit_action (Audit *audit,
                        case AUDIT_ACTION_BEFORE_UPDATE:
                                /* memorizzo tutta la table che sta per essere modificata */
                                sql = g_strdup_printf ("SELECT * FROM %s",
-                                                      nome_tabella);
+                                                      table_name);
 
                                sql_where = g_strdup (" WHERE TRUE");
-                               nome_campo = va_arg (vargs, gchar *);
-                               while (nome_campo != NULL)
+                               field_name = va_arg (vargs, gchar *);
+                               while (field_name != NULL)
                                        {
                                                value = va_arg (vargs, gchar *);
                                                if (value == NULL) break;
 
-                                               sql_where = g_strconcat (sql_where, " AND ", nome_campo, "='", value, "'", NULL);
-                                               nome_campo = va_arg (vargs, gchar *);
+                                               sql_where = g_strconcat (sql_where, " AND ", field_name, " = '", value, "'", NULL);
+                                               field_name = va_arg (vargs, gchar *);
                                        }
                                sql = g_strconcat (sql, sql_where, NULL);
                                dm = gdaex_query (datasource->gdaex, sql);
@@ -564,11 +570,11 @@ audit_action (Audit *audit,
                                if (gda_data_model_get_n_rows (dm) == 0 ||
                                    gda_data_model_get_n_rows (dm) > 1) return FALSE;
 
-                               priv->campi_upd = g_hash_table_new (g_str_hash, g_str_equal);
+                               priv->fields_updated = g_hash_table_new (g_str_hash, g_str_equal);
                                cols = gda_data_model_get_n_columns (dm);
                                for (col = 0; col < cols; col++)
                                        {
-                                               g_hash_table_insert (priv->campi_upd,
+                                               g_hash_table_insert (priv->fields_updated,
                                                                     (gpointer)gda_data_model_get_column_title (dm, col),
                                                                     (gpointer)gdaex_data_model_get_value_stringify_at (dm, col, 0));
                                        }
@@ -577,17 +583,17 @@ audit_action (Audit *audit,
                        case AUDIT_ACTION_AFTER_UPDATE:
                                /* salvo i fields modificati */
                                sql = g_strdup_printf ("SELECT * FROM %s",
-                                                      nome_tabella);
+                                                      table_name);
 
                                sql_where = g_strdup (" WHERE TRUE");
-                               nome_campo = va_arg (vargs, gchar *);
-                               while (nome_campo != NULL)
+                               field_name = va_arg (vargs, gchar *);
+                               while (field_name != NULL)
                                        {
                                                value = va_arg (vargs, gchar *);
                                                if (value == NULL) break;
 
-                                               sql_where = g_strconcat (sql_where, " AND ", nome_campo, "='", value, "'", NULL);
-                                               nome_campo = va_arg (vargs, gchar *);
+                                               sql_where = g_strconcat (sql_where, " AND ", field_name, " = '", value, "'", NULL);
+                                               field_name = va_arg (vargs, gchar *);
                                        }
                                sql = g_strconcat (sql, sql_where, NULL);
                                dm = gdaex_query (datasource->gdaex, sql);
@@ -600,29 +606,29 @@ audit_action (Audit *audit,
                                cols = gda_data_model_get_n_columns (dm);
                                for (col = 0; col < cols; col++)
                                        {
-                                               nome_campo = (gchar *)gda_data_model_get_column_title (dm, col);
+                                               field_name = (gchar *)gda_data_model_get_column_title (dm, col);
 
-                                               value = (gchar *)g_hash_table_lookup (priv->campi_upd, (gconstpointer)nome_campo);
-                                               valore_new = gdaex_data_model_get_value_stringify_at (dm, col, 0);
-                                               if (strcmp (value, valore_new) != 0)
+                                               value = (gchar *)g_hash_table_lookup (priv->fields_updated, (gconstpointer)field_name);
+                                               value_new = gdaex_data_model_get_value_stringify_at (dm, col, 0);
+                                               if (strcmp (value, value_new) != 0)
                                                        {
                                                                /* field modificato */
-                                                               insert_value (audit, id, table, nome_campo, valore_new);
+                                                               insert_value (audit, id, table, field_name, value_new);
                                                        }
                                        }
                                break;
 
                        case AUDIT_ACTION_DELETE:
                                /* salvo solo i fields della chiave */
-                               nome_campo = va_arg (vargs, gchar *);
-                               while (nome_campo != NULL)
+                               field_name = va_arg (vargs, gchar *);
+                               while (field_name != NULL)
                                        {
                                                value = va_arg (vargs, gchar *);
                                                if (value == NULL) break;
 
-                                               insert_value (audit, id, table, nome_campo, value);
+                                               insert_value (audit, id, table, field_name, value);
 
-                                               nome_campo = va_arg (vargs, gchar *);
+                                               field_name = va_arg (vargs, gchar *);
                                        }
                                break;
 
@@ -660,8 +666,8 @@ audit_destroy (Audit *audit)
  */
 gboolean
 audit_get_record_at (Audit *audit,
-                     const gchar *nome_datasource,
-                     const gchar *nome_tabella,
+                     const gchar *datasource_name,
+                     const gchar *table_name,
                      struct tm *tm_ora,
                      ...)
 {
@@ -670,11 +676,11 @@ audit_get_record_at (Audit *audit,
        Datasource *datasource;
 
        /* trovo il datasource */
-       datasource = get_datasource_from_nome (audit, nome_datasource);
+       datasource = get_datasource_from_name (audit, datasource_name);
        if (datasource == NULL)
                {
-                       g_warning ("Impossibile trovare il datasource \"%s\" nei datasource caricati",
-                                  nome_datasource);
+                       g_warning ("Unable to find the datasource \"%s\" on loaded datasources.",
+                                  datasource_name);
                        return FALSE;
                }
 

diff --git a/src/libaudit.h b/src/libaudit.h
index 3307c25c30bf5f48448bc7006d2cdf06e3650208..f8c5adb06ce9d2b3e1ca5bcf1b1f31d1c5eb6f6d 100644 (file)
--- a/src/libaudit.h
+++ b/src/libaudit.h
@@ -55,6 +55,7 @@ GType audit_get_type (void) G_GNUC_CONST;
 
 enum AuditActions
        {
+               AUDIT_ACTION_INVALID,
                AUDIT_ACTION_INSERT,
                AUDIT_ACTION_BEFORE_UPDATE,
                AUDIT_ACTION_AFTER_UPDATE,