Changeset 20361

Timestamp:

02/06/09 09:59:12 (2 years ago)

Author:

piotras

Message:

Initialize PHP Datetime object from generic midgard_timestamp value. refs #54

Files:

• trunk/midgard/apis/php5/php_midgard_gobject_generic.c (modified) (2 diffs)
• trunk/midgard/apis/php5/php_midgard_timestamp.c (modified) (1 diff)
• trunk/midgard/apis/php5/php_midgard_timestamp.h (modified) (1 diff)

trunk/midgard/apis/php5/php_midgard_gobject_generic.c

@@ -240 +240 @@
-                        
-                case G_TYPE_BOXED:
-
-
-
+
+
+
+
-
-                                array = (GValueArray *) g_value_get_boxed(gvalue);
@@ -256 +257 @@
-                                        add_index_zval(zvalue, i, zarr_val);
-                                }
+                        } 
+
+                        if (G_VALUE_TYPE(gvalue) == MGD_TYPE_TIMESTAMP) {
+                                
+                                php_midgard_datetime_from_gvalue(gvalue, zvalue);
+                                return TRUE;
-                        }
+
-                        break;
-                

trunk/midgard/apis/php5/php_midgard_timestamp.c

@@ -251 +251 @@
-}
-
+void php_midgard_datetime_from_gvalue(const GValue *gval, zval *zvalue)
+{
+        g_assert(gval != NULL);
+        g_assert(zvalue != NULL);
+        g_return_if_fail(G_VALUE_HOLDS(gval, MGD_TYPE_TIMESTAMP));
+
+        GValue str_val = {0, };
+        g_value_init(&str_val, G_TYPE_STRING);
+        g_value_transform(gval, &str_val);
+        const gchar *timestamp = g_value_get_string(&str_val);  
+
+        if (timestamp == NULL)
+                timestamp = g_strdup(MIDGARD_DEFAULT_DATETIME);
+
+        zval *date;
+        MAKE_STD_ZVAL(date);
+        ZVAL_STRING(date, (gchar *)timestamp, 1);
+        
+        g_value_unset(&str_val);
+
+        if (zvalue == NULL)
+                MAKE_STD_ZVAL(zvalue);
+        
+        object_init_ex(zvalue, php_midgard_datetime_class);
+
+        zend_call_method_with_1_params(&zvalue, php_midgard_datetime_class, NULL, "__construct", NULL, date); 
+
+        return;
+}
+
-zval *php_midgard_datetime_object_from_property(zval *object, const gchar *property)
-{

trunk/midgard/apis/php5/php_midgard_timestamp.h

@@ -28 +28 @@
-/* ROUTINES */
-gboolean php_midgard_is_property_timestamp(MidgardDBObjectClass *klass, const gchar *property);
+
-zend_class_entry *php_midgard_get_datetime_class_ptr(void);
-zend_class_entry *php_midgard_get_date_timezone_class_ptr(void);
+
+void php_midgard_datetime_from_gvalue(const GValue *gval, zval *zvalue);
+
-zval *php_midgard_datetime_object_from_property(zval *object, const gchar *property);
-zval *php_midgard_datetime_get_timestamp(zval *object);
+
-void php_midgard_datetime_object_from_string(const gchar *date, zval *zvalue);
-zval *php_midgard_string_from_datetime_object(zval *object);