cvs: php4 /ext/mnogosearch index.php php_mnogo.c

gluke Sun Dec 2 02:25:25 2001 EDT Modified files: /php4/ext/mnogosearch index.php php_mnogo.c Log: - Mnogosearch module stored API slightly changed. Example updated. Index: php4/ext/mnogosearch/index.php diff -u php4/ext/mnogosearch/index.php:1.8 php4/ext/mnogosearch/index.php:1.9 --- php4/ext/mnogosearch/index.php:1.8 Sat Dec 1 15:09:14 2001 +++ php4/ext/mnogosearch/index.php Sun Dec 2 02:25:25 2001 @@ -2,7 +2,7 @@ /* $Source: /usr/repository/php4/ext/mnogosearch/index.php,v $ - $Id: index.php,v 1.8 2001/12/01 20:09:14 gluke Exp $ + $Id: index.php,v 1.9 2001/12/02 07:25:25 gluke Exp $ */ /* mnoGoSearch-php-lite v.1.2 @@ -905,8 +905,7 @@ $stored_link=-1; if ((Udm_Api_Version() >= 30203) && ($storedaddr != '')) { - Udm_Set_Agent_Param($udm_agent,UDM_PARAM_STOREDADDR,$storedaddr); - $stored_link=Udm_Open_Stored($udm_agent); + $stored_link=Udm_Open_Stored($udm_agent,$storedaddr); } for($i=0;$i<$rows;$i++){ Index: php4/ext/mnogosearch/php_mnogo.c diff -u php4/ext/mnogosearch/php_mnogo.c:1.45 php4/ext/mnogosearch/php_mnogo.c:1.46 --- php4/ext/mnogosearch/php_mnogo.c:1.45 Sat Dec 1 15:09:14 2001 +++ php4/ext/mnogosearch/php_mnogo.c Sun Dec 2 02:25:25 2001 @@ -1,5 +1,5 @@ /* $Source: /usr/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */ -/* $Id: php_mnogo.c,v 1.45 2001/12/01 20:09:14 gluke Exp $ */ +/* $Id: php_mnogo.c,v 1.46 2001/12/02 07:25:25 gluke Exp $ */ /* +----------------------------------------------------------------------+ @@ -73,7 +73,6 @@ #define UDM_PARAM_BROWSER_CHARSET 18 #define UDM_PARAM_HLBEG 19 #define UDM_PARAM_HLEND 20 -#define UDM_PARAM_STOREDADDR 21 /* udm_add_search_limit constants */ #define UDM_LIMIT_URL 1 @@ -270,8 +269,6 @@ REGISTER_LONG_CONSTANT("UDM_PARAM_HLBEG", UDM_PARAM_HLBEG,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_PARAM_HLEND", UDM_PARAM_HLEND,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("UDM_PARAM_STOREDADDR", UDM_PARAM_STOREDADDR,CONST_CS | CONST_PERSISTENT); - /* udm_add_search_limit constants */ REGISTER_LONG_CONSTANT("UDM_LIMIT_CAT", UDM_LIMIT_CAT,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_LIMIT_URL", UDM_LIMIT_URL,CONST_CS | CONST_PERSISTENT); @@ -686,15 +683,6 @@ UdmReplaceStrVar(Agent->Conf->vars,"HlBeg",val,UDM_VARSRC_GLOBAL); break; - -#if UDM_VERSION_ID >= 30203 - case UDM_PARAM_STOREDADDR: - UdmReplaceStrVar(Agent->Conf->vars,"StoredAddr",val,UDM_VARSRC_GLOBAL); - Agent->Conf->stored_addr = strdup(UdmFindStrVar(Agent->Conf->vars, "StoredAddr", "localhost")); - - break; -#endif - #endif case UDM_PARAM_STOPTABLE: @@ -1116,21 +1104,22 @@ } /* }}} */ -/* {{{ proto int udm_open_stored(int agent) +/* {{{ proto int udm_open_stored(int agent, string storedaddr) Open connection to stored */ DLEXPORT PHP_FUNCTION(udm_open_stored) { - pval ** yyagent; + pval ** yyagent, ** yyaddr; int s; + char * addr; const char *hello = "F\0"; UDM_AGENT * Agent; int id=-1; switch(ZEND_NUM_ARGS()){ - case 1: { - if (zend_get_parameters_ex(1, &yyagent)==FAILURE) { + case 2: { + if (zend_get_parameters_ex(2, &yyagent, &yyaddr)==FAILURE) { RETURN_FALSE; } } @@ -1140,7 +1129,13 @@ break; } ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, id, "mnoGoSearch-Agent", le_link); + + convert_to_string_ex(yyaddr); + addr = Z_STRVAL_PP(yyaddr); + UdmReplaceStrVar(Agent->Conf->vars,"StoredAddr",addr,UDM_VARSRC_GLOBAL); + Agent->Conf->stored_addr = strdup(UdmFindStrVar(Agent->Conf->vars, "StoredAddr", "localhost")); + s = UdmStoreOpen(Agent->Conf); if (s >= 0) {