From 9907f14c935ba38c3211ae26e20cdb9cbdd59cb4 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Mon, 4 Jul 2011 15:16:45 +0200
Subject: [PATCH] Aggiunto il test per GDateTime.

NOTA BENE: sotto GNU/Linux non trovati i problemi di time zone del
commit precedente.
---
 .gitignore              |  1 +
 src/utils.c             | 47 +++++++++++----------------------------
 tests/Makefile.am       |  1 +
 tests/utils_gdatetime.c | 49 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 34 deletions(-)
 create mode 100644 tests/utils_gdatetime.c

diff --git a/.gitignore b/.gitignore
index a4ab5a9..d0b2e54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ tests/progresswindow
 tests/utils
 tests/utils_codfisc_piva
 tests/utils_format_money
+tests/utils_gdatetime
 tests/utils_infobar
 tests/utils_round
 *.csv
diff --git a/src/utils.c b/src/utils.c
index 91c0865..df5ce0e 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -647,12 +647,12 @@ GDateTime
 	ret = NULL;
 	if (tm_data != NULL)
 		{
-			ret = g_date_time_new_utc (tm_data->tm_year + 1900,
-			                           tm_data->tm_mon + 1,
-			                           tm_data->tm_mday,
-			                           tm_data->tm_hour,
-			                           tm_data->tm_min,
-			                           tm_data->tm_sec);
+			ret = g_date_time_new_local (tm_data->tm_year + 1900,
+			                             tm_data->tm_mon + 1,
+			                             tm_data->tm_mday,
+			                             tm_data->tm_hour,
+			                             tm_data->tm_min,
+			                             tm_data->tm_sec);
 		}
 
 	return ret;
@@ -685,28 +685,7 @@ const gchar
 
 	if (tm_data != NULL)
 		{
-			if (format == NULL)
-				{
-					_format = g_strdup ("%F %R:%S");
-				}
-			else
-				{
-					_format = g_strstrip (g_strdup (format));
-					if (g_strcmp0 (_format, "") == 0
-					    || g_strcmp0 (_format, "datetime") == 0)
-						{
-							_format = g_strdup ("%F %R:%S");
-						}
-					else if (g_strcmp0 (_format, "date") == 0)
-						{
-							_format = g_strdup ("%F");
-						}
-					else if (g_strcmp0 (_format, "time") == 0)
-						{
-							_format = g_strdup ("%R:%S");
-						}
-				}
-			ret = g_strdup_printf ("'%s'", g_date_time_format (solipa_tm_to_gdatetime (tm_data), _format));
+			ret = solipa_gdatetime_to_sql (solipa_tm_to_gdatetime (tm_data), _format);
 		}
 
 	return ret;
@@ -862,12 +841,12 @@ GDateTime
 	g_free (new_format);
 	g_free (new_str);
 
-	ret = g_date_time_new_utc (year,
-	                           month,
-	                           day,
-	                           hour,
-	                           minute,
-	                           seconds);
+	ret = g_date_time_new_local (year,
+	                             month,
+	                             day,
+	                             hour,
+	                             minute,
+	                             seconds);
 
 	return ret;
 }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index da8ccfd..fe29ea6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,5 +17,6 @@ noinst_PROGRAMS = allegato \
                   utils \
                   utils_codfisc_piva \
                   utils_format_money \
+                  utils_gdatetime \
                   utils_infobar \
                   utils_round
diff --git a/tests/utils_gdatetime.c b/tests/utils_gdatetime.c
new file mode 100644
index 0000000..457e356
--- /dev/null
+++ b/tests/utils_gdatetime.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2011 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <solipa.h>
+#include <utils.h>
+
+int
+main (int argc, char *argv[])
+{
+	GDateTime *gdatetime;
+
+	g_type_init ();
+
+	if (argc == 3)
+		{
+			gdatetime = solipa_get_gdatetime_from_string (argv[1], argv[2]);
+		}
+	else
+		{
+			g_message ("Usage: utils_gdatetime <date time string> <date time format string>");
+			return 0;
+		}
+
+	if (gdatetime == NULL)
+		{
+			g_message ("Unabel to get a GDateTime object from the string «%s».", argv[1]);
+			return 0;
+		}
+
+	g_message ("g_date_time_format %s", g_date_time_format (gdatetime, "%d/%m/%Y %H.%M.%S"));
+	g_message ("solipa_gdatetime_to_sql %s", solipa_gdatetime_to_sql (gdatetime, "datetime"));
+
+	return 0;
+}
-- 
2.49.0