Replaced strptime with a custom function, because strptime is not implemented on...

diff --git a/docs/reference/libgtkform-decl-list.txt b/docs/reference/libgtkform-decl-list.txt
index db4ff8b42f2b0b13830664cf7d142b641335c03c..524733019481e70ac402cd5799eec470441b1d77 100644 (file)
--- a/docs/reference/libgtkform-decl-list.txt
+++ b/docs/reference/libgtkform-decl-list.txt
@@ -111,6 +111,7 @@ gtk_form_field_datetime_get_value_sql
 gtk_form_field_datetime_clear
 gtk_form_field_datetime_is_empty
 gtk_form_field_datetime_set_from_datamodel
+gtk_form_field_datetime_get_tm_from_str
 </SECTION>
 
 <SECTION>

diff --git a/docs/reference/libgtkform-decl.txt b/docs/reference/libgtkform-decl.txt
index f31c5d9dee1ef4582ed776ac1299eabbe2cd23c3..61fc34127cfc6b62a7b0f12fb782e098fd638b0e 100644 (file)
--- a/docs/reference/libgtkform-decl.txt
+++ b/docs/reference/libgtkform-decl.txt
@@ -483,6 +483,11 @@ GtkFormField *field
 <RETURNS>gboolean </RETURNS>
 GtkFormField *field, GdaDataModel *dm, gint row
 </FUNCTION>
+<FUNCTION>
+<NAME>gtk_form_field_datetime_get_tm_from_str</NAME>
+<RETURNS>struct tm *</RETURNS>
+const gchar *str
+</FUNCTION>
 <MACRO>
 <NAME>TYPE_GTK_FORM_WIDGET_LABEL</NAME>
 #define TYPE_GTK_FORM_WIDGET_LABEL                 (gtk_form_widget_label_get_type ())

diff --git a/docs/reference/libgtkform-undocumented.txt b/docs/reference/libgtkform-undocumented.txt
index 7271adea8414bb22f156937738f441d2f9f3d339..c6d093359d41394f8a328c0e7511ebeb67fe1f2d 100644 (file)
--- a/docs/reference/libgtkform-undocumented.txt
+++ b/docs/reference/libgtkform-undocumented.txt
@@ -1,7 +1,7 @@
 6% symbol docs coverage.
 17 symbols documented.
 2 symbols incomplete.
-251 not documented.
+252 not documented.
 
 
 GTK_FORM
@@ -125,6 +125,7 @@ gtk_form_field_boolean_set_from_datamodel
 gtk_form_field_boolean_str_to_boolean (value)
 gtk_form_field_clear
 gtk_form_field_datetime_clear
+gtk_form_field_datetime_get_tm_from_str
 gtk_form_field_datetime_get_type
 gtk_form_field_datetime_get_value
 gtk_form_field_datetime_get_value_sql

diff --git a/docs/reference/libgtkform-unused.txt b/docs/reference/libgtkform-unused.txt
index 3e6a29a01666a41e2057b9bcfb402d771833c337..d79e4ad7382112755e8b2063409884100fb2f009 100644 (file)
--- a/docs/reference/libgtkform-unused.txt
+++ b/docs/reference/libgtkform-unused.txt
@@ -14,6 +14,7 @@ GtkFormWidgetLabelClass
 GtkFormWidgetSpinClass
 GtkFormWidgetTextviewClass
 gtk_form_field_boolean_str_to_boolean
+gtk_form_field_datetime_get_tm_from_str
 gtk_form_get_gtkbuilder
 gtk_form_get_key
 gtk_form_get_table

diff --git a/src/fielddatetime.c b/src/fielddatetime.c
index b1675491fc1cdfbb105a0908cf2a51f439c603e6..e9a1da41c5db3677783d15cd76847ab35a07d766 100644 (file)
--- a/src/fielddatetime.c
+++ b/src/fielddatetime.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -139,7 +140,7 @@ const gchar
 const GValue
 *gtk_form_field_datetime_get_value (GtkFormField *field)
 {
-       struct tm datetime;
+       struct tm *datetime;
        GValue *ret = NULL;
 
        g_return_val_if_fail (IS_GTK_FORM_FIELD_DATETIME (field), NULL);
@@ -148,11 +149,12 @@ const GValue
 
        const gchar *value = gtk_form_field_datetime_get_value_stringify (field);
 
-       if (value != NULL && strptime (value, format, &datetime) != '\0')
+       datetime = gtk_form_field_datetime_get_tm_from_str (value);
+       if (value != NULL && datetime != NULL)
                {
                        ret = g_malloc0 (sizeof (GValue));
                        g_value_init (ret, G_TYPE_POINTER);
-                       g_value_set_pointer (ret, &datetime);
+                       g_value_set_pointer (ret, datetime);
                }
 
        return (const GValue *)ret;
@@ -178,15 +180,16 @@ const gchar
 
        if (value != NULL)
                {
-                       struct tm datetime;
+                       struct tm *datetime;
 
-                       if (strptime (value, format, &datetime) != '\0')
+                       datetime = gtk_form_field_datetime_get_tm_from_str (value);
+                       if (datetime != NULL)
                                {
                                        char *buf;
 
                                        buf = g_malloc (20);
 
-                                       if (strftime (buf, 20, format, &datetime) != 0)
+                                       if (strftime (buf, 20, format, datetime) != 0)
                                                {
                                                        ret = g_strconcat ("'", buf, "'", NULL);
                                                }
@@ -269,6 +272,67 @@ gtk_form_field_datetime_set_from_datamodel (GtkFormField *field, GdaDataModel *d
        return ret;
 }
 
+/**
+ * gtk_form_field_datetime_get_tm_from_str:
+ * @str: the #gchar to be parsed.
+ *
+ */
+struct tm
+*gtk_form_field_datetime_get_tm_from_str (const gchar *str)
+{
+
+       /* TO DO
+        * check if it is a valid date/time
+     */
+
+       struct tm *tm;
+       gchar *new_str;
+
+       g_return_val_if_fail (str != NULL, NULL);
+
+       new_str = g_strstrip (g_strdup (str));
+
+       if (strcmp (new_str, "") == 0)
+               {
+                       return NULL;
+               }
+
+       tm = g_malloc0 (sizeof (struct tm));
+       tm->tm_mday = 1;
+       switch (strlen (str))
+               {
+                       case 8:
+                               /* only time */
+                               tm->tm_hour = strtol (g_strndup (new_str, 2), NULL, 10);
+                               tm->tm_min = strtol (g_strndup (new_str + 3, 2), NULL, 10);
+                               tm->tm_sec = strtol (g_strndup (new_str + 6, 2), NULL, 10);
+                               break;
+
+                       case 10:
+                               /* only date */
+                               tm->tm_year = strtol (g_strndup (new_str, 4), NULL, 10) - 1900;
+                               tm->tm_mon = strtol (g_strndup (new_str + 5, 2), NULL, 10) - 1;
+                               tm->tm_mday = strtol (g_strndup (new_str + 8, 2), NULL, 10);
+                               break;
+
+                       case 19:
+                               /* date & time */
+                               tm->tm_year = strtol (g_strndup (new_str, 4), NULL, 10) - 1900;
+                               tm->tm_mon = strtol (g_strndup (new_str + 5, 2), NULL, 10) - 1;
+                               tm->tm_mday = strtol (g_strndup (new_str + 8, 2), NULL, 10);
+                               tm->tm_hour = strtol (g_strndup (new_str + 11, 2), NULL, 10);
+                               tm->tm_min = strtol (g_strndup (new_str + 14, 2), NULL, 10);
+                               tm->tm_sec = strtol (g_strndup (new_str + 17, 2), NULL, 10);
+                               break;
+
+                       default:
+                               tm = NULL;
+                               break;
+               }
+
+       return tm;
+}
+
 /* PRIVATE */
 static void
 gtk_form_field_datetime_set_property (GObject *object,

diff --git a/src/fielddatetime.h b/src/fielddatetime.h
index 3d85e7bb667e01a1ed0c861948b663b734c1b798..c39d956ab7ffc78dd8dc5d233de48b832249d4a5 100644 (file)
--- a/src/fielddatetime.h
+++ b/src/fielddatetime.h
@@ -69,6 +69,8 @@ gboolean gtk_form_field_datetime_is_empty (GtkFormField *field);
 
 gboolean gtk_form_field_datetime_set_from_datamodel (GtkFormField *field, GdaDataModel *dm, gint row);
 
+struct tm *gtk_form_field_datetime_get_tm_from_str (const gchar *str);
+
 
 G_END_DECLS
 

diff --git a/src/form.c b/src/form.c
index 888563634c4603c448aa2250c5d8d3c002003545..db5034f38f5d44f81f31f8fc9a749270b19d9742 100644 (file)
--- a/src/form.c
+++ b/src/form.c
@@ -318,27 +318,11 @@ GtkForm
                                                                                                                                                                                                }
                                                                                                                                                                                        else
                                                                                                                                                                                                {
-                                                                                                                                                                                                       datetime = g_malloc (sizeof (struct tm));
-                                                                                                                                                                                                       if (strptime (prop, "%F %T", datetime) != NULL)
+                                                                                                                                                                                                       datetime = gtk_form_field_datetime_get_tm_from_str (prop);
+                                                                                                                                                                                                       if (datetime != NULL)
                                                                                                                                                                                                                {
                                                                                                                                                                                                                        g_object_set (G_OBJECT (field), "default", datetime, NULL);
                                                                                                                                                                                                                }
-                                                                                                                                                                                                       else
-                                                                                                                                                                                                               {
-                                                                                                                                                                                                                       datetime = g_malloc0 (sizeof (struct tm));
-                                                                                                                                                                                                                       if (strptime (prop, "%F", datetime) != NULL)
-                                                                                                                                                                                                                               {
-                                                                                                                                                                                                                                       g_object_set (G_OBJECT (field), "default", datetime, NULL);
-                                                                                                                                                                                                                               }
-                                                                                                                                                                                                                       else
-                                                                                                                                                                                                                               {
-                                                                                                                                                                                                                                       datetime = g_malloc0 (sizeof (struct tm));
-                                                                                                                                                                                                                                       if (strptime (prop, "%T", datetime) != NULL)
-                                                                                                                                                                                                                                               {
-                                                                                                                                                                                                                                                       g_object_set (G_OBJECT (field), "default", datetime, NULL);
-                                                                                                                                                                                                                                               }
-                                                                                                                                                                                                                               }
-                                                                                                                                                                                                               }
                                                                                                                                                                                                }
                                                                                                                                                                                }
                                                                                                                                                                        else if (strcmp (type, "float") == 0)

diff --git a/test/test.xml b/test/test.xml
index 757b8533307c16b0ff2328c8dac0624335ba826c..40c1dcab3f67f9c2aa07721f16a7130008ac5479 100644 (file)
--- a/test/test.xml
+++ b/test/test.xml
@@ -59,7 +59,7 @@ and   t       a       b</default>
 
        <widget type="label" name="lblDateTime">
                <field type="datetime" name="now">
-                       <default>13:20:44</default>
+                       <default>2009-10-15 10:20:44</default>
                </field>
        </widget>