From: Andrea Zagli <azagli@libero.it>
Date: Mon, 3 Aug 2009 15:40:52 +0000 (+0200)
Subject: Fixed many bugs.
X-Git-Tag: 0.1.0~4
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=985d106276a05241732d16a6e73ccb48d7187300;p=libgdaex

Fixed many bugs.
---

diff --git a/autogen.sh b/autogen.sh
index bc00245..118748d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ DIE=0
 
 have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	libtool_version=`libtoolize --version | sed 's/^.*[  ]\([0-9.]*[a-z]*\).*$/\1/'`
 	case $libtool_version in
 	    2.*)
 		have_libtool=true
diff --git a/config.h.in b/config.h.in
index 71452cc..57ae079 100644
--- a/config.h.in
+++ b/config.h.in
@@ -55,6 +55,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/src/gdaex.c b/src/gdaex.c
index 7d4bdfe..d14e0e0 100644
--- a/src/gdaex.c
+++ b/src/gdaex.c
@@ -506,9 +506,16 @@ gchar
 	error = NULL;
 
 	v = gda_data_model_get_value_at (data_model, col, row, &error);
-	if (v != NULL && error == NULL)
+	if (error == NULL)
 		{
-			ret = g_strdup (gda_value_stringify (v));
+			if (!gda_value_is_null (v))
+				{
+					ret = gda_value_stringify (v);
+				}
+			else
+				{
+					ret = g_strdup ("");
+				}
 		}
 	else
 		{
@@ -538,12 +545,12 @@ gdaex_data_model_get_value_integer_at (GdaDataModel *data_model, gint row, gint
 	error = NULL;
 
 	v = gda_data_model_get_value_at (data_model, col, row, &error);
-	if (v == NULL || error != NULL)
+	if (gda_value_is_null (v) || error != NULL)
 		{
 			g_warning ("Error on retrieving field's value: %s\n",
 			           error->message);
 		}
-	else if (!gda_value_is_null (v))
+	else
 		{
 			if (gda_value_isa (v, G_TYPE_INT))
 				{
@@ -551,7 +558,7 @@ gdaex_data_model_get_value_integer_at (GdaDataModel *data_model, gint row, gint
 				}
 			else
 				{
-					ret = atol (gda_value_stringify (v));
+					ret = strtol (gda_value_stringify (v), NULL, 10);
 				}
 		}
 
@@ -576,12 +583,12 @@ gdaex_data_model_get_value_float_at (GdaDataModel *data_model, gint row, gint co
 	error = NULL;
 
 	v = gda_data_model_get_value_at (data_model, col, row, &error);
-	if (v == NULL || error != NULL)
+	if (gda_value_is_null (v) || error != NULL)
 		{
 			g_warning ("Error on retrieving field's value: %s\n",
 			           error->message);
 		}
-	else if (!gda_value_is_null (v))
+	else
 		{
 			if (gda_value_isa (v, G_TYPE_FLOAT))
 				{
@@ -614,12 +621,12 @@ gdaex_data_model_get_value_double_at (GdaDataModel *data_model, gint row, gint c
 	error = NULL;
 
 	v = gda_data_model_get_value_at (data_model, col, row, &error);
-	if (v == NULL || error != NULL)
+	if (gda_value_is_null (v) || error != NULL)
 		{
 			g_warning ("Error on retrieving field's value: %s\n",
 			           error->message);
 		}
-	else if (!gda_value_is_null (v))
+	else
 		{
 			if (gda_value_isa (v, G_TYPE_DOUBLE))
 				{
@@ -652,12 +659,12 @@ gdaex_data_model_get_value_boolean_at (GdaDataModel *data_model, gint row, gint
 	error = NULL;
 
 	v = gda_data_model_get_value_at (data_model, col, row, &error);
-	if (v == NULL || error != NULL)
+	if (gda_value_is_null (v) || error != NULL)
 		{
 			g_warning ("Error on retrieving field's value: %s\n",
 			           error->message);
 		}
-	else if (!gda_value_is_null (v))
+	else
 		{
 			if (gda_value_isa (v, G_TYPE_BOOLEAN))
 				{
@@ -667,10 +674,10 @@ gdaex_data_model_get_value_boolean_at (GdaDataModel *data_model, gint row, gint
 				{
 					gchar *vstr = g_strstrip (gda_value_stringify (v));
 					if (strcasecmp (vstr, "true") == 0 ||
-					    strcasecmp (vstr, "t") == 0 ||
-					    strcasecmp (vstr, "yes") == 0 ||
-					    strcasecmp (vstr, "y") == 0 ||
-					    atol (vstr) != 0)
+						strcasecmp (vstr, "t") == 0 ||
+						strcasecmp (vstr, "yes") == 0 ||
+						strcasecmp (vstr, "y") == 0 ||
+						strtol (vstr, NULL, 10) != 0)
 						{
 							ret = TRUE;
 						}
@@ -924,16 +931,17 @@ gchar
 *gdaex_strescape (const gchar *source, const gchar *exceptions)
 {
 	gchar *nsource;
-	gint l;
 
-	l = strlen (source);
-
-	if (source == NULL || l == 0) return "";
-
-	nsource = g_strstrip (g_strdup (source));
-	nsource = g_strescape (nsource, exceptions);
+	if (source == NULL)
+		{
+			nsource = g_strdup ("");
+		}
+	else
+		{
+			nsource = gda_default_escape_string (source);
+		}
 
-	return gda_default_escape_string (nsource);
+	return nsource;
 }
 
 /**
@@ -946,7 +954,11 @@ gdaex_get_chr_quoting (GdaEx *gdaex)
 {
 	gchar chr = '\"';
 
-	const gchar *provider = gdaex_get_provider (gdaex);
+	const gchar *provider;
+
+	g_return_val_if_fail (IS_GDAEX (gdaex), chr);
+
+	provider = gdaex_get_provider (gdaex);
 
 	if (strcmp (provider, "MySQL") == 0)
 		{