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

gluke Sun Dec 2 05:24:38 2001 EDT Modified files: /php4/ext/mnogosearch index.php php_mnogo.c Log: - Added synonym stuff support to mnogosearch module. Slightly changed stored API. Example updated. Index: php4/ext/mnogosearch/index.php diff -u php4/ext/mnogosearch/index.php:1.9 php4/ext/mnogosearch/index.php:1.10 --- php4/ext/mnogosearch/index.php:1.9 Sun Dec 2 02:25:25 2001 +++ php4/ext/mnogosearch/index.php Sun Dec 2 05:24:38 2001 @@ -2,7 +2,7 @@ /* $Source: /usr/repository/php4/ext/mnogosearch/index.php,v $ - $Id: index.php,v 1.9 2001/12/02 07:25:25 gluke Exp $ + $Id: index.php,v 1.10 2001/12/02 10:24:38 gluke Exp $ */ /* mnoGoSearch-php-lite v.1.2 @@ -43,6 +43,8 @@ // $spell_file['ru']='/opt/udm/ispell/ru.dict'; $stopwordtable_arr[]='stopword'; // $stopwordfile_arr[]='stopwords.txt'; +$synonym_arr[]='/opt/udm/synonym/english.syn'; + $minwordlength=1; $maxwordlength=32; @@ -591,6 +593,14 @@ if ($stopwordfile_arr[$i] != '') { Udm_Set_Agent_Param($udm_agent,UDM_PARAM_STOPFILE,$stopwordfile_arr[$i]); } + } + + if (Udm_Api_Version() >= 30203) { + for ($i=0; $i < count($synonym_arr); $i++) { + if ($synonym_arr[$i] != '') { + Udm_Set_Agent_Param($udm_agent,UDM_PARAM_SYNONYM,$synonym_arr[$i]); + } + } } if ($m=='any') { Index: php4/ext/mnogosearch/php_mnogo.c diff -u php4/ext/mnogosearch/php_mnogo.c:1.46 php4/ext/mnogosearch/php_mnogo.c:1.47 --- php4/ext/mnogosearch/php_mnogo.c:1.46 Sun Dec 2 02:25:25 2001 +++ php4/ext/mnogosearch/php_mnogo.c Sun Dec 2 05:24:38 2001 @@ -1,5 +1,5 @@ /* $Source: /usr/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */ -/* $Id: php_mnogo.c,v 1.46 2001/12/02 07:25:25 gluke Exp $ */ +/* $Id: php_mnogo.c,v 1.47 2001/12/02 10:24:38 gluke Exp $ */ /* +----------------------------------------------------------------------+ @@ -73,6 +73,7 @@ #define UDM_PARAM_BROWSER_CHARSET 18 #define UDM_PARAM_HLBEG 19 #define UDM_PARAM_HLEND 20 +#define UDM_PARAM_SYNONYM 21 /* udm_add_search_limit constants */ #define UDM_LIMIT_URL 1 @@ -259,7 +260,7 @@ REGISTER_LONG_CONSTANT("UDM_PARAM_ISPELL_PREFIX",UDM_PARAM_ISPELL_PREFIXES,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_PARAM_PREFIXES", UDM_PARAM_ISPELL_PREFIXES,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_PARAM_PREFIX", UDM_PARAM_ISPELL_PREFIXES,CONST_CS | CONST_PERSISTENT); - + REGISTER_LONG_CONSTANT("UDM_PARAM_CROSS_WORDS", UDM_PARAM_CROSS_WORDS,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("UDM_PARAM_CROSSWORDS", UDM_PARAM_CROSS_WORDS,CONST_CS | CONST_PERSISTENT); @@ -269,6 +270,8 @@ 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_SYNONYM", UDM_PARAM_SYNONYM,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); @@ -682,6 +685,13 @@ case UDM_PARAM_HLEND: UdmReplaceStrVar(Agent->Conf->vars,"HlBeg",val,UDM_VARSRC_GLOBAL); + break; + + case UDM_PARAM_SYNONYM: + if (UdmSynonymListLoad(Agent->Conf,val)) { + php_error(E_WARNING,Agent->Conf->errstr); + RETURN_FALSE; + } else UdmSynonymListSort(&(Agent->Conf->SynList)); break; #endif