Changeset 16712

Timestamp:

06/25/08 13:08:36 (4 months ago)

Author:

piotras

Message:

Remove find and export methods

Files:

• trunk/midgard/apis/php5/php_midgard.h (modified) (2 diffs)
• trunk/midgard/apis/php5/php_midgard_object.c (modified) (4 diffs)

trunk/midgard/apis/php5/php_midgard.h

@@ -133 +133 @@
-PHP_FUNCTION(_midgard_php_object_update);
-PHP_FUNCTION(_midgard_php_object_create);
-PHP_FUNCTION(_midgard_php_object_find);
-PHP_FUNCTION(_midgard_php_object_is_in_parent_tree);
-PHP_FUNCTION(_midgard_php_object_is_in_tree);
@@ -147 +146 @@
-PHP_FUNCTION(_php_midgard_object_purge);
-PHP_FUNCTION(_php_midgard_object_undelete);
-PHP_FUNCTION(_php_midgard_object_export);
-PHP_FUNCTION(_php_midgard_object_parameter);
-PHP_FUNCTION(_php_midgard_object_connect);

trunk/midgard/apis/php5/php_midgard_object.c

@@ -107 +107 @@
-        }
-}
-
-PHP_FUNCTION(_midgard_php_object_find)
-{
-        zval *zval_object = getThis();
-        CHECK_MGD;
-        RETVAL_TRUE;
-
-        if(ZEND_NUM_ARGS() != 0)
-                WRONG_PARAM_COUNT;
-        
-        php_midgard_gobject *php_gobject =
-                (php_midgard_gobject *)zend_object_store_get_object(zval_object TSRMLS_CC);
-        MgdObject *mobj =
-                MIDGARD_OBJECT(php_gobject->gobject);
-
-        if(mobj) {
-                
-                guint i;
-                MidgardTypeHolder *holder = 
-                        g_new(MidgardTypeHolder, 1);
-                GObject **objects =
-                        midgard_object_find(mobj, holder);
-                array_init(return_value);
-                
-                for (i = 0; i < holder->elements; i++) {
-                        zval *zobject;
-                        MAKE_STD_ZVAL(zobject);
-                        php_midgard_gobject_new_with_gobject(zobject, Z_OBJCE_P(zval_object), 
-                                        objects[i], TRUE);
-                        zend_hash_next_index_insert(
-                                        HASH_OF(return_value), &zobject, sizeof(zval *), NULL);
-                }
-                
-                g_free(holder);
-                
-                if(objects > 0) 
-                        g_free(objects);
-        }        
-}
-  
-PHP_FUNCTION(_midgard_php_object_create)
@@ -601 +562 @@
-}
-
-PHP_FUNCTION(_php_midgard_object_export)
-{
-        RETVAL_FALSE;
-        CHECK_MGD;
-        zval *zval_object = getThis();
-        gchar *xml = NULL;
-
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") != SUCCESS) {
-                return;
-        }
-        
-        php_midgard_gobject *php_gobject =
-                (php_midgard_gobject *)zend_object_store_get_object(zval_object TSRMLS_CC);
-        MgdObject *mobj = MIDGARD_OBJECT(php_gobject->gobject);
-
-        if(mobj){
-                xml= midgard_object_export(mobj);       
-        }
-        
-        if(xml){
-                RETVAL_TRUE;
-                RETURN_STRING(xml, 1);
-        } else {
-                RETURN_NULL();
-        }
-}
-
-PHP_FUNCTION(_php_midgard_object_connect)
-{
@@ -765 +699 @@
-                ZEND_FN(_midgard_php_object_create),
-                ZEND_ACC_PUBLIC },
-        {"find",
-                ZEND_FN(_midgard_php_object_find),
-                ZEND_ACC_PUBLIC },  
-        {"is_in_parent_tree",
-                ZEND_FN(_midgard_php_object_is_in_parent_tree),
@@ -853 +784 @@
-                ZEND_FN(_php_midgard_object_undelete),
-                ZEND_ACC_STATIC|ZEND_ACC_PUBLIC }, 
-        {"export",
-                ZEND_FN(_php_midgard_object_export),
-                ZEND_ACC_PUBLIC },
-        {"connect",     
-                ZEND_FN(_php_midgard_object_connect),