Navigation

← Previous Changeset
Next Changeset →

Changeset 16167

Timestamp:

04/21/08 14:37:09 (6 months ago)

Author:

piotras

Message:

midgard_request renamed to midgard_request_config

Files:

trunk/midgard/apis/php5/php_midgard.h (modified) (1 diff)
trunk/midgard/apis/php5/php_midgard_request_config.c (copied) (copied from trunk/midgard/apis/php5/php_midgard_request.c) (13 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/midgard/apis/php5/php_midgard.h

r16149	r16167
208	208	extern void php_midgard_query_builder_init(int module_number);
209	209	extern void php_midgard_object_class_init(int module_number);
210		extern void php_midgard_request_init(int module_number);
	210	extern void php_midgard_request_config_init(int module_number);
211	211	extern void php_midgard_reflection_property_init(int module_number);
212	212	extern void php_midgard_connection_init(int module_number);

trunk/midgard/apis/php5/php_midgard_request_config.c

r16147	r16167
18	18	#include "php_midgard_gobject.h"
19	19
20		static zend_class_entry *php_midgard_request_class;
	20	static zend_class_entry *php_midgard_request_config_class;
21	21
22	22	#define _GET_REQ_OBJECT \
…	…
24	24	php_midgard_gobject *php_gobject = \
25	25	(php_midgard_gobject *)zend_object_store_get_object(zval_object TSRMLS_CC); \
26		MidgardRequest *request = MIDGARD_REQUEST(php_gobject->gobject); \
	26	MidgardRequestConfig *request = MIDGARD_REQUEST_CONFIG(php_gobject->gobject); \
27	27	if(!request) php_error(E_ERROR, "Can not find underlying request instance");
28	28
29	29	/* Object constructor */
30		static PHP_METHOD(midgard_request, __construct)
	30	static PHP_METHOD(midgard_request_config, __construct)
31	31	{
32	32	RETVAL_FALSE;
33	33	/* CHECK_MGD; */
34		MidgardRequest *req;
	34	MidgardRequestConfig *req;
35	35	const gchar *uri;
36	36	guint uri_length;
…	…
40	40	return;
41	41
42		req = midgard_request_new(uri);
	42	req = midgard_request_config_new(uri);
43	43
44	44	if(!req) {
…	…
53	53	}
54	54
55		static PHP_METHOD(midgard_request, set_page)
	55	static PHP_METHOD(midgard_request_config, set_page)
56	56	{
57	57	RETVAL_FALSE;
…	…
67	67	(php_midgard_gobject *)zend_object_store_get_object(zval_page TSRMLS_CC);
68	68
69		rv = midgard_request_set_page(request, G_OBJECT(php_page->gobject));
70
71		RETURN_BOOL(rv);
72		}
73
74		static PHP_METHOD(midgard_request, set_style)
	69	rv = midgard_request_config_set_page(request, G_OBJECT(php_page->gobject));
	70
	71	RETURN_BOOL(rv);
	72	}
	73
	74	static PHP_METHOD(midgard_request_config, set_style)
75	75	{
76	76	RETVAL_FALSE;
…	…
86	86	(php_midgard_gobject *)zend_object_store_get_object(zval_style TSRMLS_CC);
87	87
88		rv = midgard_request_set_style(request, G_OBJECT(php_style->gobject));
89
90		RETURN_BOOL(rv);
91		}
92
93		static PHP_METHOD(midgard_request, set_pages)
	88	rv = midgard_request_config_set_style(request, G_OBJECT(php_style->gobject));
	89
	90	RETURN_BOOL(rv);
	91	}
	92
	93	static PHP_METHOD(midgard_request_config, set_pages)
94	94	{
95	95	RETVAL_FALSE;
…	…
105	105
106	106	GValueArray pages = (GValueArray ) g_value_get_boxed(gval);
107		rv = midgard_request_set_pages(request, pages);
108
109		RETURN_BOOL(rv);
110		}
111
112		static PHP_METHOD(midgard_request, set_argv)
	107	rv = midgard_request_config_set_pages(request, pages);
	108
	109	RETURN_BOOL(rv);
	110	}
	111
	112	static PHP_METHOD(midgard_request_config, set_argv)
113	113	{
114	114	RETVAL_FALSE;
…	…
124	124
125	125	GValueArray argv = (GValueArray ) g_value_get_boxed(gval);
126		rv = midgard_request_set_argv(request, argv);
127
128		RETURN_BOOL(rv);
129		}
130
131		static PHP_METHOD(midgard_request, set_auth)
	126	rv = midgard_request_config_set_argv(request, argv);
	127
	128	RETURN_BOOL(rv);
	129	}
	130
	131	static PHP_METHOD(midgard_request_config, set_auth)
132	132	{
133	133	RETVAL_FALSE;
…	…
140	140	_GET_REQ_OBJECT;
141	141
142		rv = midgard_request_set_auth(request, (gboolean)zbool);
	142	rv = midgard_request_config_set_auth(request, (gboolean)zbool);
143	143
144	144	RETURN_BOOL(rv);
…	…
165	165	}
166	166
167		MidgardRequest *request = midgard_request_new(host->uri);
	167	MidgardRequestConfig *request = midgard_request_config_new(host->uri);
168	168
169	169	if(!request) {
170		g_warning("Can not initialize midgard_request for http request");
	170	g_warning("Can not initialize midgard_request_config for http request");
171	171	return;
172	172	}
…	…
246	246	}
247	247
248		/* set argv, argc is internally set by midgard_request */
	248	/* set argv, argc is internally set by midgard_request_config */
249	249	/* Reverse argument list, we prepended data for performance */
250	250	argv_list = g_list_reverse(argv_list);
…	…
267	267	}
268	268
269		midgard_request_set_argv(request, array);
270		}
271
272		midgard_request_set_host(request, G_OBJECT(host->host));
273		midgard_request_set_page(request, last_page);
274		//midgard_request_set_style(rcfg, host->style);
	269	midgard_request_config_set_argv(request, array);
	270	}
	271
	272	midgard_request_config_set_host(request, G_OBJECT(host->host));
	273	midgard_request_config_set_page(request, last_page);
	274	//midgard_request_config_set_style(rcfg, host->style);
275	275
276	276	mgd_handle()->rcfg = request;
…	…
278	278	zval *mro = NULL;
279	279	MAKE_STD_ZVAL(mro);
280		php_midgard_gobject_init(mro, "midgard_request", G_OBJECT(request), TRUE);
	280	php_midgard_gobject_init(mro, "midgard_request_config", G_OBJECT(request), TRUE);
281	281	}
282	282
283	283	/* Initialize class */
284		void php_midgard_request_init(int module_number)
	284	void php_midgard_request_config_init(int module_number)
285	285	{
286	286	static function_entry request_methods[] = {
287		PHP_ME(midgard_request, __construct, NULL, ZEND_ACC_PUBLIC)
288		PHP_ME(midgard_request, set_page, NULL, ZEND_ACC_PUBLIC)
289		PHP_ME(midgard_request, set_style, NULL, ZEND_ACC_PUBLIC)
290		PHP_ME(midgard_request, set_pages, NULL, ZEND_ACC_PUBLIC)
291		PHP_ME(midgard_request, set_argv, NULL, ZEND_ACC_PUBLIC)
292		PHP_ME(midgard_request, set_auth, NULL, ZEND_ACC_PUBLIC)
	287	PHP_ME(midgard_request_config, __construct, NULL, ZEND_ACC_PUBLIC)
	288	PHP_ME(midgard_request_config, set_page, NULL, ZEND_ACC_PUBLIC)
	289	PHP_ME(midgard_request_config, set_style, NULL, ZEND_ACC_PUBLIC)
	290	PHP_ME(midgard_request_config, set_pages, NULL, ZEND_ACC_PUBLIC)
	291	PHP_ME(midgard_request_config, set_argv, NULL, ZEND_ACC_PUBLIC)
	292	PHP_ME(midgard_request_config, set_auth, NULL, ZEND_ACC_PUBLIC)
293	293	{NULL, NULL, NULL}
294	294	};
295	295
296		static zend_class_entry php_midgard_request_class_entry;
	296	static zend_class_entry php_midgard_request_config_class_entry;
297	297
298	298	INIT_CLASS_ENTRY(
299		php_midgard_request_class_entry,
300		"midgard_request", request_methods);
301
302		php_midgard_request_class =
303		zend_register_internal_class(&php_midgard_request_class_entry TSRMLS_CC);
	299	php_midgard_request_config_class_entry,
	300	"midgard_request_config", request_methods);
	301
	302	php_midgard_request_config_class =
	303	zend_register_internal_class(&php_midgard_request_config_class_entry TSRMLS_CC);
304	304
305	305	/* Set function to initialize underlying data */
306		php_midgard_request_class->create_object = php_midgard_gobject_new;
307		}
	306	php_midgard_request_config_class->create_object = php_midgard_gobject_new;
	307	}

Navigation

Changeset 16167

Legend:

trunk/midgard/apis/php5/php_midgard.h

trunk/midgard/apis/php5/php_midgard_request_config.c

Download in other formats: