Changeset 11177

Timestamp:

07/11/07 15:17:12 (2 years ago)

Author:

piotras

Message:

Experimental DateTime? implementation for MGD_TYPE_TIMESTAMP properties

Files:

• trunk/midgard/apis/php4/midgard.c (modified) (1 diff)
• trunk/midgard/apis/php4/php_midgard.h (modified) (1 diff)
• trunk/midgard/apis/php4/php_midgard_collector.c (modified) (2 diffs)
• trunk/midgard/apis/php4/php_midgard_connection.c (modified) (1 diff)
• trunk/midgard/apis/php4/php_midgard_gobject_generic.c (modified) (12 diffs)
• trunk/midgard/apis/php4/php_midgard_object_parameter.c (modified) (1 diff)
• trunk/midgard/apis/php4/query_builder.c (modified) (1 diff)

trunk/midgard/apis/php4/midgard.c

@@ -266 +266 @@
-                        if(objid->type != IS_NULL) {
-                                
-
+
+
-                                gobject = midgard_object_new(mgd, 
-                                                (const gchar *) zend_classname,

trunk/midgard/apis/php4/php_midgard.h

@@ -192 +192 @@
-
-extern GValue *php_midgard_zval2gvalue(zval *zvalue);
-
+
+
-
-zend_class_entry *midgard_php_register_internal_class(

trunk/midgard/apis/php4/php_midgard_collector.c

@@ -163 +163 @@
-        zval *zvalue;
-        MAKE_STD_ZVAL(zvalue);
-
+
+
-        
-        add_assoc_zval(zend_hash,
@@ -222 +223 @@
-                return;
-        
-
+, NULL, NULL
-}
-

trunk/midgard/apis/php4/php_midgard_connection.c

@@ -94 +94 @@
-                zval *pid;
-                MAKE_STD_ZVAL(pid);
-
+, NULL, NULL
-                g_value_unset(&pval);
-                zend_hash_update(Z_ARRVAL_PP(_midgard),

trunk/midgard/apis/php4/php_midgard_gobject_generic.c

@@ -17 +17 @@
-#include "php_midgard.h"
-#include "php_midgard_gobject.h"
-
+
+
+
+
+
-
-/* GVALUE ROUTINES */
@@ -31 +35 @@
-        HashPosition iterator;
-        GValue *tmpval;
+        const gchar *dtstr;
+        zend_class_entry *dtce;
-
-        switch(Z_TYPE_P(zvalue)) {
@@ -74 +80 @@
-        
-                case IS_OBJECT:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        break;
-
@@ -86 +105 @@
-}
-
-
+
+
-{
-        g_assert(gvalue);
@@ -100 +120 @@
-        GValue *arr_val;
-        zval *zarr_val;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        switch (G_TYPE_FUNDAMENTAL(G_VALUE_TYPE(gvalue))) {
-                
@@ -147 +186 @@
-
-                case G_TYPE_OBJECT:
-       
+
-                        gobject_property = g_value_get_object(gvalue);
-
@@ -200 +239 @@
-                                        arr_val = g_value_array_get_nth(array, i);
-                                        MAKE_STD_ZVAL(zarr_val);
-
+
+
-                                        add_index_zval(zvalue, i, zarr_val);
-                                }
@@ -256 +296 @@
-                                                        (const gchar *) _classname, 
-                                                        NULL);
+                                
+                                guint k;
+                                for ( k = 0; k < 5; k++) {
+                                        midgard_object_new(
+                                                        mgd_handle(),
+                                                        "midgard_article",
+                                                        NULL);
+                                        g_warning("K %d", k);
+                                }
+
-                        } else {
-                                
@@ -297 +347 @@
-                g_object_get_property(G_OBJECT(gobject), Z_STRVAL_P(prop), &pval);
-                MAKE_STD_ZVAL(_retval);
-
+
+
+
-                g_value_unset(&pval);
+                                
+                if(pspec->value_type == MGD_TYPE_TIMESTAMP)
+                        g_warning("IS DATE");
-        
-        } else {
@@ -332 +387 @@
-        if(pspec) {
-
-
+
+
-                g_object_set_property(gobject, Z_STRVAL_P(prop), gvalue);
-                std_hnd->write_property(zobject, prop, value TSRMLS_CC);
@@ -472 +528 @@
-                        
-                        MAKE_STD_ZVAL(tmp);
-
+
+
+
-                        zend_hash_update(php_gobject->zo.properties, 
-                                        props[i]->name, strlen(props[i]->name)+1, 
@@ -629 +687 @@
-
-        return rce;
+}
+
+/* DATETIME OBJECT */
+
+static zval ***__copy_args(zval *args)
+{
+        zval ***params = NULL;
+        guint i;
+        guint argc = 0;
+
+        if(args != NULL) {
+                
+                argc = zend_hash_num_elements(Z_ARRVAL_P(args));
+                params = (zval ***)emalloc(argc * sizeof(zval **));
+                zend_hash_internal_pointer_reset(Z_ARRVAL_P(args));
+                
+                for(i = 0; i < argc; i++) {
+                        
+                        zend_hash_get_current_data(Z_ARRVAL_P(args), (void **)&params[i]);
+                        zend_hash_move_forward(Z_ARRVAL_P(args));
+                }
+
+                return params;
+        }
+
+        return NULL;
+}
+
+static void php_midgard_datetime_from_string(const gchar *date, zval *zvalue)
+{
+        /* DateTimeZone object */
+        zend_class_entry *dtz_ce = 
+                php_midgard_get_baseclass_ptr_by_name("DateTimeZone");
+        
+        zval *dtz_params;
+        MAKE_STD_ZVAL(dtz_params);
+        array_init(dtz_params);
+        /* Initialize object for UTC timezone */
+        add_index_string(dtz_params, 0, "UTC", 0);
+        
+        zval *dtz_object;
+        MAKE_STD_ZVAL(dtz_object);
+        object_init_ex(dtz_object, dtz_ce);
+        zval *dtz_constructor;
+        MAKE_STD_ZVAL(dtz_constructor);
+        ZVAL_STRING(dtz_constructor, "__construct", 0);
+
+        /* Copy constructor arguments */
+        zval ***args = __copy_args(dtz_params);
+
+        zval *retval = NULL;
+        int cld = call_user_function_ex(NULL, &dtz_object, dtz_constructor,
+                        &retval, 1, args, 0, NULL TSRMLS_CC);
+        efree(args);
+
+        /* DateTime object */
+        zend_class_entry *dt_ce = 
+                php_midgard_get_baseclass_ptr_by_name("DateTime");
+        
+        zval *dt_params;
+        MAKE_STD_ZVAL(dt_params);
+        array_init(dt_params);
+        /* Initialize object for given time string and timezone*/
+        if(date == NULL) date = "now";
+        add_index_string(dt_params, 0, (gchar *)date, 1);
+        add_index_zval(dt_params, 1, dtz_object);
+        
+        object_init_ex(zvalue, dt_ce);
+        zval *dt_constructor;
+        MAKE_STD_ZVAL(dt_constructor);
+        ZVAL_STRING(dt_constructor, "__construct", 0);
+
+        /* Copy constructor arguments */
+        args = __copy_args(dt_params);
+
+        cld = call_user_function_ex(NULL, &zvalue, dt_constructor,
+                        &retval, 2, args, 0, NULL TSRMLS_CC);
+        efree(args);
+        
+        return;
+}
+
+static const gchar *php_midgard_string_from_datetime(zval *zvalue)
+{
+        if(Z_TYPE_P(zvalue) != IS_OBJECT) {
+                
+                g_warning("Can not format ISO datetime string. Value is not an object");
+                return NULL;
+        }
+
+        /* Create params array and format ISO8601 compatible string */
+        zval *dt_params;
+        MAKE_STD_ZVAL(dt_params);
+        array_init(dt_params);
+        add_index_string(dt_params, 0, (gchar *)"DateTime::ISO8601", 0);
+
+        zval *f_format;
+        MAKE_STD_ZVAL(f_format);
+        ZVAL_STRING(f_format, "format", 0);
+
+        /* Copy function arguments */
+        zval ***args = __copy_args(dt_params);
+
+        /* TSRMSLS_FETCH(); */ /* Should be called here (required for CG macro ) */
+        
+        zval *retval;   
+        call_user_function_ex(NULL, &zvalue, f_format,
+                        &retval, 1, args, 1, NULL TSRMLS_CC);
+        efree(args);
+
+        g_warning("STRV %s", Z_STRVAL_P(retval));
+        return (const gchar *)Z_STRVAL_P(retval);
-}
-

trunk/midgard/apis/php4/php_midgard_object_parameter.c

@@ -57 +57 @@
-                                                        domain, name);
-                                if(gvalue != NULL)
-
+
+
+
-                                else 
-                                        RETURN_NULL();

trunk/midgard/apis/php4/query_builder.c

@@ -207 +207 @@
-                php_midgard_gobject_new_with_gobject(zobject, *ce, objects[i], TRUE);
-                zend_hash_next_index_insert(
-
+       
-        }
-