From 1b14655df471e2ebbfb3f7e72e65a308f6b0703c Mon Sep 17 00:00:00 2001
From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Thu, 24 Jun 2010 10:30:35 +0200
Subject: [PATCH] Changed value_string_unquote to string_unquote. Bugfixes on
 get_*_from_name.

---
 src/audit.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/audit.c b/src/audit.c
index ff7bd53..01c002c 100644
--- a/src/audit.c
+++ b/src/audit.c
@@ -73,7 +73,7 @@ static gboolean insert_value (Audit *audit,
                               Table *table,
                               gchar *field_name,
                               gchar *value);
-static gchar *value_string_unquote (const gchar *value);
+static gchar *string_unquote (const gchar *value);
 static void parse_cond (GdaSqlExpr *cond, gchar **str);
 
 static void audit_set_property (GObject *object,
@@ -304,9 +304,13 @@ static Field
 {
 	GList *c = g_list_first (table->fields);
 
+	gchar *real_field;
+
+	real_field = string_unquote (field);
+
 	while (c != NULL)
 		{
-			if (g_strcmp0 (((Field *)c->data)->name, field) == 0)
+			if (g_strcmp0 (((Field *)c->data)->name, real_field) == 0)
 				{
 					return (Field *)c->data;
 				}
@@ -324,9 +328,13 @@ static Table
 {
 	GList *t = g_list_first (datasource->tables);
 
+	gchar *real_table;
+
+	real_table = string_unquote (table);
+
 	while (t != NULL)
 		{
-			if (g_strcmp0 (((Table *)t->data)->name, table) == 0)
+			if (g_strcmp0 (((Table *)t->data)->name, real_table) == 0)
 				{
 					return (Table *)t->data;
 				}
@@ -345,9 +353,13 @@ static Datasource
 
 	GList *f = g_list_first (priv->datasources);
 
+	gchar *real_datasource;
+
+	real_datasource = string_unquote (datasource);
+
 	while (f != NULL)
 		{
-			if (g_strcmp0 (((Datasource *)f->data)->name, datasource) == 0)
+			if (g_strcmp0 (((Datasource *)f->data)->name, real_datasource) == 0)
 				{
 					return (Datasource *)f->data;
 				}
@@ -394,7 +406,7 @@ insert_value (Audit *audit,
 			                       " (id, id_actions, id_fields, value)"
 			                       " VALUES (%d, %d, %d, '%s')",
 			                       id_new, id_actions, field->id,
-			                       gdaex_strescape ((const gchar *)value_string_unquote (value), NULL));
+			                       gdaex_strescape ((const gchar *)string_unquote (value), NULL));
 			gdaex_execute (priv->gdaex, sql);
 		}
 
@@ -429,19 +441,25 @@ parse_cond (GdaSqlExpr *cond, gchar **str)
 }
 
 static gchar
-*value_string_unquote (const gchar *value)
+*string_unquote (const gchar *str)
 {
 	gchar *ret;
 	guint l;
 
-	ret = g_strdup (value);
+	g_return_val_if_fail (str != NULL, NULL);
+
+	ret = g_strdup (str);
 	l = strlen (ret);
 
 	if (l > 0)
 		{
-			if (ret[0] == '\'' && ret[l - 1] == '\'')
+			if (ret[0] == '"' || ret[0] == '\'')
+				{
+					ret = g_strdup (ret + 1);
+				}
+			if (ret[strlen (ret) - 1] == '"' || ret[strlen (ret) - 1] == '\'')
 				{
-					ret = g_strndup (ret + 1, l - 2);
+					ret = g_strndup (ret, strlen (ret) - 1);
 				}
 		}
 
-- 
2.49.0