archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- mnogosearch extension updated to compile with mnogosearch-3.2.8

Browse source
This commit is contained in:
Sergey Kartashoff 2002-12-16 19:17:10 +00:00
parent 59656cc706
commit afa0e1e03e
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/mnogosearch/php_mnogo.c
View file

@ -468,7 +468,9 @@ DLEXPORT PHP_FUNCTION(udm_alloc_agent)
UdmVarListReplaceStr(&Env->Vars,"DBAddr",dbaddr); UdmVarListReplaceStr(&Env->Vars,"DBAddr",dbaddr);
if(UDM_OK!=UdmDBSetAddr(Env->db,dbaddr,UDM_OPEN_MODE_READ)){ if(UDM_OK!=UdmDBSetAddr(Env->db,dbaddr,UDM_OPEN_MODE_READ)){
sprintf(Env->errstr,"Invalid DBAddr: '%s'",dbaddr); sprintf(Env->errstr,"Invalid DBAddr: '%s'",dbaddr);
#if UDM_VERSION_ID <= 30207
Env->errcode=1; Env->errcode=1;
#endif
php_error(E_WARNING,"%s(): Invalid DBAddr", get_active_function_name(TSRMLS_C)); php_error(E_WARNING,"%s(): Invalid DBAddr", get_active_function_name(TSRMLS_C));
RETURN_FALSE; RETURN_FALSE;
} }
@ -519,7 +521,9 @@ DLEXPORT PHP_FUNCTION(udm_alloc_agent)
UdmVarListReplaceStr(&Env->Vars,"DBAddr",dbaddr); UdmVarListReplaceStr(&Env->Vars,"DBAddr",dbaddr);
if(UDM_OK!=UdmDBSetAddr(Env->db,dbaddr,UDM_OPEN_MODE_READ)){ if(UDM_OK!=UdmDBSetAddr(Env->db,dbaddr,UDM_OPEN_MODE_READ)){
sprintf(Env->errstr,"Invalid DBAddr: '%s'",dbaddr); sprintf(Env->errstr,"Invalid DBAddr: '%s'",dbaddr);
#if UDM_VERSION_ID <= 30207
Env->errcode=1; Env->errcode=1;
#endif
php_error(E_WARNING,"%s(): Invalid DBAddr", get_active_function_name(TSRMLS_C)); php_error(E_WARNING,"%s(): Invalid DBAddr", get_active_function_name(TSRMLS_C));
RETURN_FALSE; RETURN_FALSE;
} }
@ -999,6 +1003,8 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
case UDM_PARAM_VARDIR: case UDM_PARAM_VARDIR:
#if UDM_VERSION_ID < 30200 #if UDM_VERSION_ID < 30200
udm_snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR); udm_snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR);
#elif UDM_VERSION_ID >= 30208
UdmVarListReplaceStr(&Agent->Conf->Vars,"Vardir",val);
#elif UDM_VERSION_ID >= 30204 #elif UDM_VERSION_ID >= 30204
UdmVarListReplaceStr(&Agent->Conf->Vars,"Vardir",val); UdmVarListReplaceStr(&Agent->Conf->Vars,"Vardir",val);
snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR); snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR);
@ -1717,8 +1723,10 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param_ex)
Agent->Conf->WordParam.min_word_len=atoi(val); Agent->Conf->WordParam.min_word_len=atoi(val);
} else if (!strcasecmp(var,"MaxWordLen")) { } else if (!strcasecmp(var,"MaxWordLen")) {
Agent->Conf->WordParam.max_word_len=atoi(val); Agent->Conf->WordParam.max_word_len=atoi(val);
#if UDM_VERSION_ID <= 30207
} else if (!strcasecmp(var,"VarDir")) { } else if (!strcasecmp(var,"VarDir")) {
snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR); snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR);
#endif
} }
RETURN_TRUE; RETURN_TRUE;
@ -2171,7 +2179,13 @@ DLEXPORT PHP_FUNCTION(udm_errno)
break; break;
} }
ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent", le_link); ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent", le_link);
#if UDM_VERSION_ID >= 30204 #if UDM_VERSION_ID >= 30208
if (UdmEnvErrMsg(Agent->Conf) && strlen(UdmEnvErrMsg(Agent->Conf))) {
RETURN_LONG(1);
} else {
RETURN_LONG(0);
}
#elif UDM_VERSION_ID >= 30204
RETURN_LONG(UdmEnvErrCode(Agent->Conf)); RETURN_LONG(UdmEnvErrCode(Agent->Conf));
#else #else
RETURN_LONG(UdmDBErrorCode(Agent->db)); RETURN_LONG(UdmDBErrorCode(Agent->db));