gluke Fri Mar 2 03:41:34 2001 EDT
Modified files:
/php4/ext/mnogosearch php_mnogo.c test.php
Log:
UDM_ISPELL_TYPE_SERVER parameter in udm_load_ispell_data has been added
to work with ispell server. This feature is available starting from
mnoGoSearch 3.1.12 or later. Fixed Udm_Free_Ispell_Data(). Example updated.
Index: php4/ext/mnogosearch/php_mnogo.c
diff -u php4/ext/mnogosearch/php_mnogo.c:1.22 php4/ext/mnogosearch/php_mnogo.c:1.23
--- php4/ext/mnogosearch/php_mnogo.c:1.22 Thu Mar 1 06:51:11 2001
+++ php4/ext/mnogosearch/php_mnogo.c Fri Mar 2 03:41:34 2001
@@ -1,5 +1,5 @@
/* $Source: /local/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.22 2001/03/01 14:51:11 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.23 2001/03/02 11:41:34 gluke Exp $ */
/*
+----------------------------------------------------------------------+
@@ -643,6 +643,10 @@
case UDM_ISPELL_TYPE_AFFIX:
Agent->Conf->ispell_mode &= ~UDM_ISPELL_MODE_DB;
+
+#if UDM_VERSION_ID > 30111
+ Agent->Conf->ispell_mode &= ~UDM_ISPELL_MODE_SERVER;
+#endif
if (UdmImportAffixes(Agent->Conf,val1,val2,NULL,0)) {
php_error(E_WARNING,"Udm_Load_Ispell_Data: Cannot load
affix file %s",val2);
@@ -654,16 +658,28 @@
case UDM_ISPELL_TYPE_SPELL:
Agent->Conf->ispell_mode &= ~UDM_ISPELL_MODE_DB;
+#if UDM_VERSION_ID > 30111
+ Agent->Conf->ispell_mode &= ~UDM_ISPELL_MODE_SERVER;
+#endif
+
if (UdmImportDictionary(Agent->Conf,val1,val2,1,"")) {
php_error(E_WARNING,"Udm_Load_Ispell_Data: Cannot load
spell file %s",val2);
RETURN_FALSE;
}
break;
-
+
+#if UDM_VERSION_ID > 30111
+
case UDM_ISPELL_TYPE_SERVER:
+ Agent->Conf->ispell_mode &= ~UDM_ISPELL_MODE_DB;
+ Agent->Conf->ispell_mode |= UDM_ISPELL_MODE_SERVER;
+
+ Agent->Conf->spellhost = strdup(val1);
break;
+
+#endif
default:
php_error(E_WARNING,"Udm_Load_Ispell_Data: Unknown ispell type
parameter");
@@ -702,7 +718,9 @@
}
ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent",
le_link);
- /* UdmClearIspellData(Agent->Conf); */
+#if UDM_VERSION_ID > 30111
+ UdmFreeIspell(Agent->Conf);
+#endif
RETURN_TRUE;
}
Index: php4/ext/mnogosearch/test.php
diff -u php4/ext/mnogosearch/test.php:1.18 php4/ext/mnogosearch/test.php:1.19
--- php4/ext/mnogosearch/test.php:1.18 Thu Mar 1 06:51:11 2001
+++ php4/ext/mnogosearch/test.php Fri Mar 2 03:41:34 2001
@@ -1,6 +1,6 @@
<!--
$Source: /local/repository/php4/ext/mnogosearch/test.php,v $
- $Id: test.php,v 1.18 2001/03/01 14:51:11 gluke Exp $
+ $Id: test.php,v 1.19 2001/03/02 11:41:34 gluke Exp $
-->
<html>
@@ -59,10 +59,14 @@
// if ((!
Udm_Load_Ispell_Data($udm,UDM_ISPELL_TYPE_AFFIX,'en','/opt/udm/ispell/en.aff',0)) ||
// (!
Udm_Load_Ispell_Data($udm,UDM_ISPELL_TYPE_SPELL,'en','/opt/udm/ispell/en.dict',1))) {
-// printf("Error #%d: '%s'\n",Udm_Errno($udm),Udm_Error($udm));
+// printf("Error loading ispell data from files<br>\n");
// exit;
// }
+ if (! Udm_Load_Ispell_Data($udm,UDM_ISPELL_TYPE_SERVER,'','',1)) {
+ printf("Error loading ispell data from server<br>\n");
+ exit;
+ }
// Stage 3: add search limits
// Udm_Add_Search_Limit($udm,UDM_LIMIT_URL,"http://www.mydomain.com/%");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
