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

@- Some mnogosearch-3.2.x compilation bugs fixes.

Browse source 
@  Make crosswords and weight sections work with mnogosearch-3.2.x
@  UDM_PARAM_HLBEG, UDM_PARAM_HLEND mnoGoSearch Agent parameters
@  has been added (gluke)
- Some mnogosearch-3.2.x compilation bugs fixes.
Make crosswords and weight sections work with mnogosearch-3.2.x
UDM_PARAM_HLBEG, UDM_PARAM_HLEND mnoGoSearch Agent parameters
has been added (gluke)
This commit is contained in:
Sergey Kartashoff 2001-11-03 21:45:50 +00:00
parent 0f20565919
commit eb4754441f
1 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

45
ext/mnogosearch/php_mnogo.c
View file

@ -69,6 +69,8 @@
#define UDM_PARAM_VARDIR 16 #define UDM_PARAM_VARDIR 16
#define UDM_PARAM_LOCAL_CHARSET 17 #define UDM_PARAM_LOCAL_CHARSET 17
#define UDM_PARAM_BROWSER_CHARSET 18 #define UDM_PARAM_BROWSER_CHARSET 18
#define UDM_PARAM_HLBEG 19
#define UDM_PARAM_HLEND 20
/* udm_add_search_limit constants */ /* udm_add_search_limit constants */
#define UDM_LIMIT_URL 1 #define UDM_LIMIT_URL 1
@ -250,6 +252,9 @@ DLEXPORT PHP_MINIT_FUNCTION(mnogosearch)
REGISTER_LONG_CONSTANT("UDM_PARAM_VARDIR", UDM_PARAM_VARDIR,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_PARAM_VARDIR", UDM_PARAM_VARDIR,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("UDM_PARAM_DATADIR", UDM_PARAM_VARDIR,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_PARAM_DATADIR", UDM_PARAM_VARDIR,CONST_CS | CONST_PERSISTENT);
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);
/* udm_add_search_limit constants */ /* udm_add_search_limit constants */
REGISTER_LONG_CONSTANT("UDM_LIMIT_CAT", UDM_LIMIT_CAT,CONST_CS | CONST_PERSISTENT); 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); REGISTER_LONG_CONSTANT("UDM_LIMIT_URL", UDM_LIMIT_URL,CONST_CS | CONST_PERSISTENT);
@ -602,7 +607,7 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
#if UDM_VERSION_ID < 30200 #if UDM_VERSION_ID < 30200
Agent->Conf->ispell_mode |= UDM_ISPELL_USE_PREFIXES; Agent->Conf->ispell_mode |= UDM_ISPELL_USE_PREFIXES;
#else #else
UdmAddIntVar(Env->vars, "IspellUsePrefixes", 1, UDM_VARSRC_GLOBAL); UdmAddIntVar(Agent->Conf->vars, "IspellUsePrefixes", 1, UDM_VARSRC_GLOBAL);
#endif #endif
break; break;
@ -610,7 +615,7 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
#if UDM_VERSION_ID < 30200 #if UDM_VERSION_ID < 30200
Agent->Conf->ispell_mode &= ~UDM_ISPELL_USE_PREFIXES; Agent->Conf->ispell_mode &= ~UDM_ISPELL_USE_PREFIXES;
#else #else
UdmAddIntVar(Env->vars, "IspellUsePrefixes", 0, UDM_VARSRC_GLOBAL); UdmAddIntVar(Agent->Conf->vars, "IspellUsePrefixes", 0, UDM_VARSRC_GLOBAL);
#endif #endif
break; break;
@ -619,7 +624,7 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
#if UDM_VERSION_ID < 30200 #if UDM_VERSION_ID < 30200
Agent->Conf->ispell_mode |= UDM_ISPELL_USE_PREFIXES; Agent->Conf->ispell_mode |= UDM_ISPELL_USE_PREFIXES;
#else #else
UdmAddIntVar(Env->vars, "IspellUsePrefixes", 1, UDM_VARSRC_GLOBAL); UdmAddIntVar(Agent->Conf->vars, "IspellUsePrefixes", 1, UDM_VARSRC_GLOBAL);
#endif #endif
php_error(E_WARNING,"Udm_Set_Agent_Param: Unknown ispell prefixes mode"); php_error(E_WARNING,"Udm_Set_Agent_Param: Unknown ispell prefixes mode");
RETURN_FALSE; RETURN_FALSE;
@ -634,6 +639,7 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
Agent->Conf->local_charset=UdmGetCharset(val); Agent->Conf->local_charset=UdmGetCharset(val);
Agent->charset=Agent->Conf->local_charset; Agent->charset=Agent->Conf->local_charset;
#else #else
Agent->Conf->local_charset=strdup(val);
UdmReplaceStrVar(Agent->Conf->vars,"LocalCharset",val,UDM_VARSRC_GLOBAL); UdmReplaceStrVar(Agent->Conf->vars,"LocalCharset",val,UDM_VARSRC_GLOBAL);
#endif #endif
@ -641,9 +647,21 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
#if UDM_VERSION_ID >= 30200 #if UDM_VERSION_ID >= 30200
case UDM_PARAM_BROWSER_CHARSET: case UDM_PARAM_BROWSER_CHARSET:
Agent->Conf->browser_charset=strdup(val);
UdmReplaceStrVar(Agent->Conf->vars,"BrowserCharset",val,UDM_VARSRC_GLOBAL); UdmReplaceStrVar(Agent->Conf->vars,"BrowserCharset",val,UDM_VARSRC_GLOBAL);
break; break;
case UDM_PARAM_HLBEG:
UdmReplaceStrVar(Agent->Conf->vars,"HlBeg",val,UDM_VARSRC_GLOBAL);
break;
case UDM_PARAM_HLEND:
UdmReplaceStrVar(Agent->Conf->vars,"HlBeg",val,UDM_VARSRC_GLOBAL);
break;
#endif #endif
case UDM_PARAM_STOPTABLE: case UDM_PARAM_STOPTABLE:
@ -665,6 +683,23 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
Agent->weight_factor=strdup(val); Agent->weight_factor=strdup(val);
#else #else
UdmReplaceStrVar(Agent->Conf->vars,"wf",val,UDM_VARSRC_GLOBAL); UdmReplaceStrVar(Agent->Conf->vars,"wf",val,UDM_VARSRC_GLOBAL);
{
size_t len;
len=strlen(val);
if((len>0)&&(len<256)){
const char *sec;
int sn;
for(sn=0;sn<256;sn++){
Agent->wf[sn]=0;
}
for(sec=val+len-1;sec>=val;sec--){
Agent->wf[len-(sec-val)]=UdmHex2Int(*sec);
}
}
}
#endif #endif
break; break;
@ -678,8 +713,6 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
break; break;
#if UDM_VERSION_ID > 30110
case UDM_PARAM_CROSS_WORDS: case UDM_PARAM_CROSS_WORDS:
switch (atoi(val)){ switch (atoi(val)){
case UDM_CROSS_WORDS_ENABLED: case UDM_CROSS_WORDS_ENABLED:
@ -697,8 +730,6 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
} }
break; break;
#endif
#if UDM_VERSION_ID > 30112 #if UDM_VERSION_ID > 30112