X-Git-Url: http://git.indexdata.com/?p=phpyaz-moved-to-github.git;a=blobdiff_plain;f=php_yaz.c;h=04ddea6f1483ead0f52fa45126c09ad0f6e9d372;hp=a6720994c1597ecbe27e65b535fdbf0533114783;hb=1db9cada81079a6a7cec772ba0b32fbc5d9fb83a;hpb=826d85668f6e97bbf5f10fa93d2f16ae055471ba

diff --git a/php_yaz.c b/php_yaz.c
index a672099..04ddea6 100644
--- a/php_yaz.c
+++ b/php_yaz.c
@@ -16,8 +16,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_yaz.c,v 1.115 2008/02/20 10:08:15 dickmeiss Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,8 +48,17 @@
 #include <yaz/oid_db.h>
 #include <yaz/zoom.h>
 
+#ifndef ODR_INT_PRINTF
+#define ODR_INT_PRINTF %d
+#endif
+
 #define MAX_ASSOC 200
 
+#define GET_PARM1(a) zend_parse_parameters(1 , "z", a)
+#define GET_PARM2(a,b) zend_parse_parameters(2, "zz", a, b)
+#define GET_PARM3(a,b,c) zend_parse_parameters(3, "zzz", a, b, c)
+#define GET_PARM4(a,b,c,d) zend_parse_parameters(4, "zzzz", a, b, c, d)
+
 typedef struct Yaz_AssociationInfo *Yaz_Association;
 
 struct Yaz_AssociationInfo {
@@ -170,7 +177,7 @@ function_entry yaz_functions [] = {
 	{NULL, NULL, NULL}
 };
 
-static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, pval **id, Yaz_Association *assocp)
+static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, pval *id, Yaz_Association *assocp)
 {
 	Yaz_Association *as = 0;
 	
@@ -179,7 +186,7 @@ static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, pval **id, Yaz_Association *
 	tsrm_mutex_lock (yaz_mutex);
 #endif
 
-	ZEND_FETCH_RESOURCE(as, Yaz_Association *, id, -1, "YAZ link", le_link);
+	ZEND_FETCH_RESOURCE(as, Yaz_Association *, &id, -1, "YAZ link", le_link);
 
 	if (as && *as && (*as)->order == YAZSG(assoc_seq) && (*as)->in_use) {
 		*assocp = *as;
@@ -302,25 +309,25 @@ PHP_FUNCTION(yaz_connect)
 	const char *preferredMessageSize = 0;
 	int persistent = 1;
 	int piggyback = 1;
-	pval **zurl, **user = 0;
+	pval *zurl, *user = 0;
 	Yaz_Association as;
 	int max_links = YAZSG(max_links);
 
 	otherInfo[0] = otherInfo[1] = otherInfo[2] = 0;
 
 	if (ZEND_NUM_ARGS() == 1) {
-		if (zend_get_parameters_ex (1, &zurl) == FAILURE) {
+		if (GET_PARM1(&zurl) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 	} else if (ZEND_NUM_ARGS() == 2) {
-		if (zend_get_parameters_ex (2, &zurl, &user) == FAILURE) {
+		if (GET_PARM2(&zurl, &user) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
-
-		if (Z_TYPE_PP(user) == IS_ARRAY) {
+		
+		if (Z_TYPE_PP(&user) == IS_ARRAY) {
 			long *persistent_val;
 			long *piggyback_val;
-			HashTable *ht = Z_ARRVAL_PP(user);
+			HashTable *ht = Z_ARRVAL_PP(&user);
 			
 			sru_str = array_lookup_string(ht, "sru");
 			sru_version_str = array_lookup_string(ht, "sru_version");
@@ -345,16 +352,16 @@ PHP_FUNCTION(yaz_connect)
 			otherInfo[0] = array_lookup_string(ht, "otherInfo0");
 			otherInfo[1] = array_lookup_string(ht, "otherInfo1");
 			otherInfo[2] = array_lookup_string(ht, "otherInfo2");
-		} else if (Z_TYPE_PP(user) == IS_STRING) {
-			convert_to_string_ex(user);
-			if (*(*user)->value.str.val)
-				user_str = (*user)->value.str.val;
+		} else if (Z_TYPE_PP(&user) == IS_STRING) {
+			convert_to_string_ex(&user);
+			if (*user->value.str.val)
+				user_str = user->value.str.val;
 		}
 	} else {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_string_ex(zurl);
-	zurl_str = (*zurl)->value.str.val;
+	convert_to_string_ex(&zurl);
+	zurl_str = zurl->value.str.val;
 	for (cp = zurl_str; *cp && strchr("\t\n ", *cp); cp++);
 	if (!*cp) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty zurl");
@@ -456,12 +463,12 @@ PHP_FUNCTION(yaz_connect)
 PHP_FUNCTION(yaz_close)
 {
 	Yaz_Association p;
-	pval **id;
+	pval *id;
 
 	if (ZEND_NUM_ARGS() != 1) {
 		WRONG_PARAM_COUNT;
 	}
-	if (zend_get_parameters_ex (1, &id) == FAILURE) {
+	if (GET_PARM1(&id) == FAILURE) {
 		RETURN_FALSE;
 	}
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, id, &p);
@@ -469,7 +476,7 @@ PHP_FUNCTION(yaz_close)
 		RETURN_FALSE;
 	}
 	release_assoc(p);
-	zend_list_delete((*id)->value.lval);
+	zend_list_delete(id->value.lval);
 
 	RETURN_TRUE;
 }
@@ -480,11 +487,11 @@ PHP_FUNCTION(yaz_close)
 PHP_FUNCTION(yaz_search)
 {
 	char *query_str, *type_str;
-	pval **id, **type, **query;
+	pval *id, *type, *query;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() == 3) {
-		if (zend_get_parameters_ex(3, &id, &type, &query) == FAILURE) {
+		if (GET_PARM3(&id, &type, &query) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 	} else {
@@ -496,10 +503,10 @@ PHP_FUNCTION(yaz_search)
 		RETURN_FALSE;
 	}
 
-	convert_to_string_ex(type);
-	type_str = (*type)->value.str.val;
-	convert_to_string_ex(query);
-	query_str = (*query)->value.str.val;
+	convert_to_string_ex(&type);
+	type_str = type->value.str.val;
+	convert_to_string_ex(&query);
+	query_str = query->value.str.val;
 
 	ZOOM_resultset_destroy(p->zoom_set);
 	p->zoom_set = 0;
@@ -547,13 +554,13 @@ PHP_FUNCTION(yaz_search)
    Retrieve records */
 PHP_FUNCTION(yaz_present)
 {
-	pval **id;
+	pval *id;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() != 1) {
 		WRONG_PARAM_COUNT;
 	}
-	if (zend_get_parameters_ex(1, &id) == FAILURE) {
+	if (GET_PARM1(id) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -578,7 +585,7 @@ PHP_FUNCTION(yaz_present)
    Process events. */
 PHP_FUNCTION(yaz_wait)
 {
-	pval **pval_options = 0;
+	pval *pval_options = 0;
 	int event_mode = 0;
 	int no = 0;
 	ZOOM_connection conn_ar[MAX_ASSOC];
@@ -589,14 +596,14 @@ PHP_FUNCTION(yaz_wait)
 		long *val = 0;
 		long *event_bool = 0;
 		HashTable *options_ht = 0;
-		if (zend_get_parameters_ex(1, &pval_options) == FAILURE) {
+		if (GET_PARM1(&pval_options) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
-		if (Z_TYPE_PP(pval_options) != IS_ARRAY) {
+		if (Z_TYPE_PP(&pval_options) != IS_ARRAY) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
 			RETURN_FALSE;
 		}
-		options_ht = Z_ARRVAL_PP(pval_options);
+		options_ht = Z_ARRVAL_PP(&pval_options);
 		val = array_lookup_long(options_ht, "timeout");
 		if (val) {
 			timeout = *val;
@@ -630,9 +637,9 @@ PHP_FUNCTION(yaz_wait)
 			Yaz_Association p = conn_as[ev-1];
 			int event_code = ZOOM_connection_last_event(p->zoom_conn);
 
-			add_assoc_long(*pval_options, "connid", ev);
+			add_assoc_long(pval_options, "connid", ev);
 
-			add_assoc_long(*pval_options, "eventcode", event_code);
+			add_assoc_long(pval_options, "eventcode", event_code);
 
 			zend_list_addref(p->zval_resource);
 			Z_LVAL_P(return_value) = p->zval_resource;
@@ -653,10 +660,10 @@ PHP_FUNCTION(yaz_wait)
    Return last error number (>0 for bib-1 diagnostic, <0 for other error, 0 for no error */
 PHP_FUNCTION(yaz_errno)
 {
-	pval **id;
+	pval *id;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &id) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || GET_PARM1(&id) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, id, &p);
@@ -672,10 +679,10 @@ PHP_FUNCTION(yaz_errno)
    Return last error message */
 PHP_FUNCTION(yaz_error)
 {
-	pval **id;
+	pval *id;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &id) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 ||	GET_PARM1(&id) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -699,10 +706,10 @@ PHP_FUNCTION(yaz_error)
    Return additional info for last error (empty string if none) */
 PHP_FUNCTION(yaz_addinfo)
 {
-	pval **id;
+	pval *id;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &id) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || GET_PARM1(&id) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -722,18 +729,18 @@ PHP_FUNCTION(yaz_addinfo)
    Return number of hits (result count) for last search */
 PHP_FUNCTION(yaz_hits)
 {
-	pval **id, **searchresult = 0;
+	pval *id, *searchresult = 0;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() == 1) {
-		if (zend_get_parameters_ex(1, &id) == FAILURE) {
+		if (GET_PARM1(&id) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 	} else if (ZEND_NUM_ARGS() == 2) {
-		if (zend_get_parameters_ex(2, &id, &searchresult) == FAILURE) {
+		if (GET_PARM2(&id, &searchresult) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
-		if (array_init(*searchresult) == FAILURE) {
+		if (array_init(searchresult) == FAILURE) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING,
 							 "Could not initialize search result array");
 			RETURN_FALSE;
@@ -750,7 +757,7 @@ PHP_FUNCTION(yaz_hits)
 			const char *str =
 				ZOOM_resultset_option_get(p->zoom_set, "resultSetStatus");
 			if (str)
-				add_assoc_string(*searchresult, "resultSetStatus", 
+				add_assoc_string(searchresult, "resultSetStatus", 
 								 (char *) str, 1);
 		}
 		if (searchresult)
@@ -770,7 +777,7 @@ PHP_FUNCTION(yaz_hits)
 
 				MAKE_STD_ZVAL(zval_element);
 				array_init(zval_element);
-				add_next_index_zval(*searchresult, zval_element);
+				add_next_index_zval(searchresult, zval_element);
 				
 				sprintf(opt_name, "searchresult.%d.id", i);
 				opt_value = ZOOM_resultset_option_get(p->zoom_set, opt_name);
@@ -1072,7 +1079,7 @@ static void retval_array3_grs1(zval *return_value, Z_GenericRecord *p,
 		
 		if (e->tagValue->which == Z_StringOrNumeric_numeric)
 		{
-			sprintf(tagstr, "%d", *e->tagValue->u.numeric);
+			sprintf(tagstr, ODR_INT_PRINTF, *e->tagValue->u.numeric);
 			tag = tagstr;
 		}
 		else if (e->tagValue->which == Z_StringOrNumeric_string)
@@ -1115,7 +1122,7 @@ static void retval_array3_grs1(zval *return_value, Z_GenericRecord *p,
 			const char *tag = 0;
 			if (e->tagValue->which == Z_StringOrNumeric_numeric)
 			{
-				sprintf(tagstr, "%d", *e->tagValue->u.numeric);
+				sprintf(tagstr, ODR_INT_PRINTF, *e->tagValue->u.numeric);
 				tag = tagstr;
 			}
 			else if (e->tagValue->which == Z_StringOrNumeric_string)
@@ -1142,7 +1149,7 @@ static void retval_array3_grs1(zval *return_value, Z_GenericRecord *p,
 					const char *tag = 0;
 					if (e->tagValue->which == Z_StringOrNumeric_numeric)
 					{
-						sprintf(tagstr, "%d", *e->tagValue->u.numeric);
+						sprintf(tagstr, ODR_INT_PRINTF, *e->tagValue->u.numeric);
 						tag = tagstr;
 					}
 					else if (e->tagValue->which == Z_StringOrNumeric_string)
@@ -1257,7 +1264,7 @@ static void retval_array1_grs1(zval *return_value, Z_GenericRecord *p,
 				memcpy(tag + taglen, e->tagValue->u.string, len);
 				tag[taglen+len] = '\0';
 			} else if (e->tagValue->which == Z_StringOrNumeric_numeric) {
-				sprintf(tag + taglen, "%d", *e->tagValue->u.numeric);
+				sprintf(tag + taglen, ODR_INT_PRINTF, *e->tagValue->u.numeric);
 			}
 			taglen = strlen(tag);
 			strcpy(tag + taglen, ")");
@@ -1332,7 +1339,7 @@ static void ext_grs1(zval *return_value, char type_args[][60],
    Return record information at given result set position */
 PHP_FUNCTION(yaz_record)
 {
-	pval **pval_id, **pval_pos, **pval_type;
+	pval *pval_id, *pval_pos, *pval_type;
 	Yaz_Association p;
 	int pos;
 	char *type;
@@ -1340,16 +1347,16 @@ PHP_FUNCTION(yaz_record)
 	if (ZEND_NUM_ARGS() != 3) {
 		WRONG_PARAM_COUNT;
 	}
-	if (zend_get_parameters_ex(3, &pval_id, &pval_pos, &pval_type) == FAILURE) {
+	if (GET_PARM3( &pval_id, &pval_pos, &pval_type)	== FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 
-	convert_to_long_ex(pval_pos);
-	pos = (*pval_pos)->value.lval;
-	convert_to_string_ex(pval_type);
-	type = (*pval_type)->value.str.val;
+	convert_to_long_ex(&pval_pos);
+	pos = pval_pos->value.lval;
+	convert_to_string_ex(&pval_type);
+	type = pval_type->value.str.val;
 
 	if (p && p->zoom_set) {
 		ZOOM_record r;
@@ -1399,16 +1406,17 @@ PHP_FUNCTION(yaz_record)
    Set record syntax for retrieval */
 PHP_FUNCTION(yaz_syntax)
 {
-	pval **pval_id, **pval_syntax;
+	pval *pval_id, *pval_syntax;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_syntax) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_syntax) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-	convert_to_string_ex(pval_syntax);
-	option_set(p, "preferredRecordSyntax", (*pval_syntax)->value.str.val);
+	convert_to_string_ex(&pval_syntax);
+	option_set(p, "preferredRecordSyntax", pval_syntax->value.str.val);
 	release_assoc(p);
 }
 /* }}} */
@@ -1417,17 +1425,18 @@ PHP_FUNCTION(yaz_syntax)
    Set Element-Set-Name for retrieval */
 PHP_FUNCTION(yaz_element)
 {
-	pval **pval_id, **pval_element;
+	pval *pval_id, *pval_element;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_element) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_element) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 
-	convert_to_string_ex(pval_element);
-	option_set(p, "elementSetName", (*pval_element)->value.str.val);
+	convert_to_string_ex(&pval_element);
+	option_set(p, "elementSetName", pval_element->value.str.val);
 	release_assoc(p);
 }
 /* }}} */
@@ -1436,16 +1445,17 @@ PHP_FUNCTION(yaz_element)
    Set Schema for retrieval */
 PHP_FUNCTION(yaz_schema)
 {
-	pval **pval_id, **pval_element;
+	pval *pval_id, *pval_element;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_element) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_element) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-	convert_to_string_ex(pval_element);
-	option_set(p, "schema", (*pval_element)->value.str.val);
+	convert_to_string_ex(&pval_element);
+	option_set(p, "schema", pval_element->value.str.val);
 	release_assoc(p);
 }
 /* }}} */
@@ -1454,14 +1464,14 @@ PHP_FUNCTION(yaz_schema)
    Set Option(s) for connection */
 PHP_FUNCTION(yaz_set_option)
 {
-	pval **pval_ar, **pval_name, **pval_val, **pval_id;
+	pval *pval_ar, *pval_name, *pval_val, *pval_id;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() == 2) {
-		if (zend_get_parameters_ex(2, &pval_id, &pval_ar) == FAILURE) {
+		if (GET_PARM2(&pval_id, &pval_ar) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
-		if (Z_TYPE_PP(pval_ar) != IS_ARRAY) {
+		if (Z_TYPE_PP(&pval_ar) != IS_ARRAY) {
 			WRONG_PARAM_COUNT;
 		}
 		get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
@@ -1470,7 +1480,7 @@ PHP_FUNCTION(yaz_set_option)
 			HashTable *ht;
 			zval **ent;
 			
-			ht = Z_ARRVAL_PP(pval_ar);
+			ht = Z_ARRVAL_PP(&pval_ar);
 			for(zend_hash_internal_pointer_reset_ex(ht, &pos);
 				zend_hash_get_current_data_ex(ht, (void**) &ent, &pos) == SUCCESS;
 				zend_hash_move_forward_ex(ht, &pos)
@@ -1490,13 +1500,13 @@ PHP_FUNCTION(yaz_set_option)
 			release_assoc (p);
 		}
 	} else if (ZEND_NUM_ARGS() == 3) {
-		if (zend_get_parameters_ex(3, &pval_id, &pval_name, &pval_val) == FAILURE) {
+		if (GET_PARM3( &pval_id, &pval_name, &pval_val) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-		convert_to_string_ex(pval_name);
-		convert_to_string_ex(pval_val);
-		option_set(p, (*pval_name)->value.str.val, (*pval_val)->value.str.val);
+		convert_to_string_ex(&pval_name);
+		convert_to_string_ex(&pval_val);
+		option_set(p, pval_name->value.str.val, pval_val->value.str.val);
 		
 		release_assoc(p);
 	} else {
@@ -1509,21 +1519,21 @@ PHP_FUNCTION(yaz_set_option)
    Set Option(s) for connection */
 PHP_FUNCTION(yaz_get_option)
 {
-	pval **pval_id, **pval_name;
+	pval *pval_id, *pval_name;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() != 2) {
 		WRONG_PARAM_COUNT;
 	}
-	if (zend_get_parameters_ex(2, &pval_id, &pval_name) == FAILURE) {
+	if (GET_PARM2(&pval_id, &pval_name) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 	if (p) {
 		const char *name_str, *v;
-		convert_to_string_ex (pval_name);
-		name_str = (*pval_name)->value.str.val;
+		convert_to_string_ex(&pval_name);
+		name_str = pval_name->value.str.val;
 
 		v = option_get(p, name_str);
 		if (!v) {
@@ -1543,18 +1553,19 @@ PHP_FUNCTION(yaz_get_option)
    Set result set start point and number of records to request */
 PHP_FUNCTION(yaz_range)
 {
-	pval **pval_id, **pval_start, **pval_number;
+	pval *pval_id, *pval_start, *pval_number;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &pval_id, &pval_start, &pval_number) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 3 ||
+		GET_PARM3( &pval_id, &pval_start, &pval_number)	== FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-	convert_to_long_ex(pval_start);
-	convert_to_long_ex(pval_number);
-	option_set_int(p, "start", (*pval_start)->value.lval - 1);
-	option_set_int(p, "count", (*pval_number)->value.lval);
+	convert_to_long_ex(&pval_start);
+	convert_to_long_ex(&pval_number);
+	option_set_int(p, "start", pval_start->value.lval - 1);
+	option_set_int(p, "count", pval_number->value.lval);
 	release_assoc(p);
 }
 /* }}} */
@@ -1563,21 +1574,22 @@ PHP_FUNCTION(yaz_range)
    Set result set sorting criteria */
 PHP_FUNCTION(yaz_sort)
 {
-	pval **pval_id, **pval_criteria;
+	pval *pval_id, *pval_criteria;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_criteria) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_criteria) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 	if (p) {
-		convert_to_string_ex(pval_criteria);
+		convert_to_string_ex(&pval_criteria);
 		xfree(p->sort_criteria);
-		p->sort_criteria = xstrdup((*pval_criteria)->value.str.val);
+		p->sort_criteria = xstrdup(pval_criteria->value.str.val);
 		if (p->zoom_set)
 			ZOOM_resultset_sort(p->zoom_set, "yaz",
-								(*pval_criteria)->value.str.val);
+								pval_criteria->value.str.val);
 	}
 	release_assoc(p);
 }
@@ -1592,13 +1604,14 @@ const char *ill_array_lookup (void *handle, const char *name)
    Sends Item Order request */
 PHP_FUNCTION(yaz_itemorder)
 {
-	pval **pval_id, **pval_package;
+	pval *pval_id, *pval_package;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_package) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_package) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	if (Z_TYPE_PP(pval_package) != IS_ARRAY) {
+	if (Z_TYPE_PP(&pval_package) != IS_ARRAY) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
 		RETURN_FALSE;
 	}
@@ -1607,7 +1620,8 @@ PHP_FUNCTION(yaz_itemorder)
 	if (p) {
 		ZOOM_options options = ZOOM_options_create();
 		
-		ZOOM_options_set_callback(options, ill_array_lookup, Z_ARRVAL_PP(pval_package));
+		ZOOM_options_set_callback(options,
+								  ill_array_lookup, Z_ARRVAL_PP(&pval_package));
 		ZOOM_package_destroy(p->zoom_package);
 		p->zoom_package = ZOOM_connection_package(p->zoom_conn, options);
 		ZOOM_package_send(p->zoom_package, "itemorder");
@@ -1622,20 +1636,19 @@ PHP_FUNCTION(yaz_itemorder)
    Sends Extended Services Request */
 PHP_FUNCTION(yaz_es)
 {
-	pval **pval_id, **pval_type, **pval_package;
+	pval *pval_id, *pval_type, *pval_package;
 	Yaz_Association p;
 	
 	if (ZEND_NUM_ARGS() != 3 ||
-		zend_get_parameters_ex(3, &pval_id, &pval_type, 
-							   &pval_package) == FAILURE) {
+		GET_PARM3( &pval_id, &pval_type, &pval_package) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	if (Z_TYPE_PP(pval_type) != IS_STRING) {
+	if (Z_TYPE_PP(&pval_type) != IS_STRING) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected string parameter");
 		RETURN_FALSE;
 	}
 	
-	if (Z_TYPE_PP(pval_package) != IS_ARRAY) {
+	if (Z_TYPE_PP(&pval_package) != IS_ARRAY) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
 		RETURN_FALSE;
 	}
@@ -1644,10 +1657,11 @@ PHP_FUNCTION(yaz_es)
 	if (p) {
 		ZOOM_options options = ZOOM_options_create();
 		
-		ZOOM_options_set_callback(options, ill_array_lookup, Z_ARRVAL_PP(pval_package));
+		ZOOM_options_set_callback(options, ill_array_lookup,
+								  Z_ARRVAL_PP(&pval_package));
 		ZOOM_package_destroy(p->zoom_package);
 		p->zoom_package = ZOOM_connection_package(p->zoom_conn, options);
-		ZOOM_package_send(p->zoom_package, (*pval_type)->value.str.val);
+		ZOOM_package_send(p->zoom_package, pval_type->value.str.val);
 		ZOOM_options_set_callback(options, 0, 0);
 		ZOOM_options_destroy (options);
 	}
@@ -1659,29 +1673,30 @@ PHP_FUNCTION(yaz_es)
    Sends Scan Request */
 PHP_FUNCTION(yaz_scan)
 {
-	pval **pval_id, **pval_type, **pval_query, **pval_flags = 0;
+	pval *pval_id, *pval_type, *pval_query, *pval_flags = 0;
 	HashTable *flags_ht = 0;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() == 3) {
-		if (zend_get_parameters_ex(3, &pval_id, &pval_type, &pval_query) == FAILURE) {
+		if (GET_PARM3( &pval_id, &pval_type, &pval_query) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 	} else if (ZEND_NUM_ARGS() == 4) {
-		if (zend_get_parameters_ex(4, &pval_id, &pval_type, &pval_query, &pval_flags) == FAILURE) {
+		if (GET_PARM4(&pval_id, &pval_type, &pval_query, &pval_flags)
+			== FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
-		if (Z_TYPE_PP(pval_flags) != IS_ARRAY) {
+		if (Z_TYPE_PP(&pval_flags) != IS_ARRAY) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad flags parameter");
 			RETURN_FALSE;
 		}
-		flags_ht = Z_ARRVAL_PP(pval_flags);
+		flags_ht = Z_ARRVAL_PP(&pval_flags);
 	} else {
 		WRONG_PARAM_COUNT;
 	}
 
-	convert_to_string_ex(pval_type);
-	convert_to_string_ex(pval_query);
+	convert_to_string_ex(&pval_type);
+	convert_to_string_ex(&pval_query);
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 	ZOOM_scanset_destroy(p->zoom_scan);
@@ -1690,7 +1705,8 @@ PHP_FUNCTION(yaz_scan)
 		option_set(p, "number", array_lookup_string(flags_ht, "number"));
 		option_set(p, "position", array_lookup_string(flags_ht, "position"));
 		option_set(p, "stepSize", array_lookup_string(flags_ht, "stepsize"));
-		p->zoom_scan = ZOOM_connection_scan(p->zoom_conn, Z_STRVAL_PP(pval_query));
+		p->zoom_scan = ZOOM_connection_scan(p->zoom_conn, 
+											Z_STRVAL_PP(&pval_query));
 	}
 	release_assoc(p);
 }
@@ -1700,10 +1716,10 @@ PHP_FUNCTION(yaz_scan)
    Inspects Extended Services Result */
 PHP_FUNCTION(yaz_es_result)
 {
-	pval **pval_id;
+	pval *pval_id;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pval_id) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 ||	GET_PARM1(&pval_id) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1731,15 +1747,15 @@ PHP_FUNCTION(yaz_es_result)
    Inspects Scan Result */
 PHP_FUNCTION(yaz_scan_result)
 {
-	pval **pval_id, **pval_opt = 0;
+	pval *pval_id, *pval_opt = 0;
 	Yaz_Association p;
 
 	if (ZEND_NUM_ARGS() == 2) {
-		if (zend_get_parameters_ex(2, &pval_id, &pval_opt) == FAILURE) {
+		if (GET_PARM2(&pval_id, &pval_opt) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 	} else if (ZEND_NUM_ARGS() == 1) {
-		if (zend_get_parameters_ex(1, &pval_id) == FAILURE) {
+		if (GET_PARM1(&pval_id) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 	} else {
@@ -1748,14 +1764,19 @@ PHP_FUNCTION(yaz_scan_result)
 
 	array_init(return_value);
 
-	if (pval_opt && array_init(*pval_opt) == FAILURE) {
+	if (pval_opt && array_init(pval_opt) == FAILURE) {
 		RETURN_FALSE;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 	if (p && p->zoom_scan) {
 		int pos = 0;
+		/* ZOOM_scanset_term changed from YAZ 3 to YAZ 4 */
+#if YAZ_VERSIONL >= 0x040000
+		size_t occ, len;
+#else
 		int occ, len;
+#endif
 		int size = ZOOM_scanset_size(p->zoom_scan);
 		
 		for (pos = 0; pos < size; pos++) {
@@ -1789,19 +1810,19 @@ PHP_FUNCTION(yaz_scan_result)
 		if (pval_opt) {
 			const char *v;
 	
-			add_assoc_long(*pval_opt, "number", size);
+			add_assoc_long(pval_opt, "number", size);
 			
 			v = ZOOM_scanset_option_get(p->zoom_scan, "stepSize");
 			if (v) {
-				add_assoc_long(*pval_opt, "stepsize", atoi(v));
+				add_assoc_long(pval_opt, "stepsize", atoi(v));
 			}
 			v = ZOOM_scanset_option_get(p->zoom_scan, "position");
 			if (v) {
-				add_assoc_long(*pval_opt, "position", atoi(v));
+				add_assoc_long(pval_opt, "position", atoi(v));
 			}
 			v = ZOOM_scanset_option_get(p->zoom_scan, "scanStatus");
 			if (v) {
-				add_assoc_long(*pval_opt, "status", atoi(v));
+				add_assoc_long(pval_opt, "status", atoi(v));
 			}
 		}
 	}
@@ -1813,21 +1834,22 @@ PHP_FUNCTION(yaz_scan_result)
    Configure CCL package */
 PHP_FUNCTION(yaz_ccl_conf)
 {
-	pval **pval_id, **pval_package;
+	pval *pval_id, *pval_package;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_package) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_package) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
-	if (Z_TYPE_PP(pval_package) != IS_ARRAY) {
+	if (Z_TYPE_PP(&pval_package) != IS_ARRAY) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
 		RETURN_FALSE;
 	}
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 	if (p) {
-		HashTable *ht = Z_ARRVAL_PP(pval_package);
+		HashTable *ht = Z_ARRVAL_PP(&pval_package);
 		HashPosition pos;
 		zval **ent;
 		char *key;
@@ -1859,20 +1881,21 @@ PHP_FUNCTION(yaz_ccl_conf)
    Parse a CCL query */
 PHP_FUNCTION(yaz_ccl_parse)
 {
-	pval **pval_id, **pval_query, **pval_res = 0;
+	pval *pval_id, *pval_query, *pval_res = 0;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &pval_id, &pval_query, &pval_res) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 3 || GET_PARM3( &pval_id, &pval_query, &pval_res)
+		== FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
-	pval_destructor(*pval_res);
-	array_init(*pval_res);
-	convert_to_string_ex (pval_query);
+	pval_destructor(pval_res);
+	array_init(pval_res);
+	convert_to_string_ex(&pval_query);
 
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
 	if (p) {
-		const char *query_str = (*pval_query)->value.str.val;
+		const char *query_str = pval_query->value.str.val;
 		struct ccl_rpn_node *rpn;
 		int error_pos;
 		int error_code;
@@ -1881,13 +1904,13 @@ PHP_FUNCTION(yaz_ccl_parse)
 		rpn = ccl_parser_find_str(ccl_parser, query_str);
 
 		error_code = ccl_parser_get_error(ccl_parser, &error_pos);
-		add_assoc_long(*pval_res, "errorcode", error_code);
+		add_assoc_long(pval_res, "errorcode", error_code);
 
 		if (error_code) 
 		{
-			add_assoc_string(*pval_res, "errorstring", 
+			add_assoc_string(pval_res, "errorstring", 
 							 (char *) ccl_err_msg(error_code), 1);
-			add_assoc_long(*pval_res, "errorpos", error_pos);
+			add_assoc_long(pval_res, "errorpos", error_pos);
 			RETVAL_FALSE;
 		} 
 		else 
@@ -1920,10 +1943,10 @@ PHP_FUNCTION(yaz_ccl_parse)
 					add_assoc_string(zval_stopword, "term", (char *) term, 1);
 					add_next_index_zval(zval_stopwords, zval_stopword);
 				}
-				add_assoc_zval(*pval_res, "stopwords", zval_stopwords);
+				add_assoc_zval(pval_res, "stopwords", zval_stopwords);
 			}
 			ccl_pquery(wrbuf_pqf, rpn);
-			add_assoc_stringl(*pval_res, "rpn", 
+			add_assoc_stringl(pval_res, "rpn", 
 							  wrbuf_buf(wrbuf_pqf), wrbuf_len(wrbuf_pqf), 1);
 			wrbuf_destroy(wrbuf_pqf);
 			ccl_stop_words_destroy(csw);
@@ -1941,16 +1964,17 @@ PHP_FUNCTION(yaz_ccl_parse)
    Specify the databases within a session */
 PHP_FUNCTION(yaz_database)
 {
-	pval **pval_id, **pval_database;
+	pval *pval_id, *pval_database;
 	Yaz_Association p;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pval_id, &pval_database) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+		GET_PARM2(&pval_id, &pval_database) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
-	convert_to_string_ex(pval_database);
+	convert_to_string_ex(&pval_database);
 	get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-	option_set(p, "databaseName", (*pval_database)->value.str.val);
+	option_set(p, "databaseName", pval_database->value.str.val);
 	RETVAL_TRUE;
 	release_assoc(p);
 }