summaryrefslogtreecommitdiff
path: root/ext/enchant
diff options
context:
space:
mode:
Diffstat (limited to 'ext/enchant')
-rwxr-xr-xext/enchant/config.m48
-rw-r--r--ext/enchant/config.w323
-rw-r--r--ext/enchant/docs/examples/example1.php2
-rwxr-xr-xext/enchant/enchant.c126
-rw-r--r--ext/enchant/php_enchant.h9
5 files changed, 129 insertions, 19 deletions
diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4
index f52689adb..8a36ee83c 100755
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.1 2004/03/08 20:12:12 pajoye Exp $
+dnl $Id: config.m4 289597 2009-10-12 22:35:36Z pajoye $
dnl
PHP_ARG_WITH(enchant,for ENCHANT support,
@@ -33,4 +33,10 @@ if test "$PHP_ENCHANT" != "no"; then
PHP_SUBST(ENCHANT_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
PHP_ADD_INCLUDE($ENCHANT_INCDIR)
+ PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
+ [
+ AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+ AC_DEFINE(ENCHANT_VERSION_STRING, "1.5.x", [ ])
+ ], [], [ -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD])
+
fi
diff --git a/ext/enchant/config.w32 b/ext/enchant/config.w32
index 99a46731f..f36b7c8e9 100644
--- a/ext/enchant/config.w32
+++ b/ext/enchant/config.w32
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2009/01/13 13:30:30 pajoye Exp $
+// $Id: config.w32 289597 2009-10-12 22:35:36Z pajoye $
// vim:ft=javascript
ARG_WITH("enchant", "Enchant Support", "no");
@@ -9,6 +9,7 @@ if (PHP_ENCHANT == "yes") {
CHECK_LIB("libenchant.lib", "enchant", PHP_ENCHANT) ) {
EXTENSION("enchant", "enchant.c");
AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+ AC_DEFINE('HAVE_ENCHANT_BROKER_SET_PARAM', 1);
ADD_FLAG("CFLAG_ENCHANT", "/D _WIN32");
} else {
WARNING('Could not find enchant.h; skipping');
diff --git a/ext/enchant/docs/examples/example1.php b/ext/enchant/docs/examples/example1.php
index 9d503f74e..048cc83a1 100644
--- a/ext/enchant/docs/examples/example1.php
+++ b/ext/enchant/docs/examples/example1.php
@@ -13,7 +13,7 @@ if (enchant_broker_dict_exists($r,$tag)) {
$spellerrors = enchant_dict_check($d, "soong");
print_r($dprovides);
echo "found $spellerrors spell errors\n";
- if ($spellerrors) {
+ if (spellerrors) {
$suggs = enchant_dict_suggest($d, "soong");
echo "Suggestions for 'soong':";
print_r($suggs);
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 7c95bf6c7..1a003aa10 100755
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -16,23 +16,19 @@
| Ilia Alshanetsky <ilia@prohost.org> |
+----------------------------------------------------------------------+
- $Id: enchant.c,v 1.19.2.3 2009/01/30 00:16:32 felipe Exp $
+ $Id: enchant.c 289597 2009-10-12 22:35:36Z pajoye $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#ifdef PHP_WIN32
-#include <glib/glist.h>
-#include <glib/ghash.h>
-#endif
+
#include <enchant.h>
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_enchant.h"
-
typedef EnchantBroker * EnchantBrokerPtr;
typedef struct _broker_struct enchant_broker;
typedef struct _dict_struct enchant_dict;
@@ -64,6 +60,9 @@ static int le_enchant_dict;
/* If you declare any globals in php_enchant.h uncomment this:*/
/*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/
+#define PHP_ENCHANT_MYSPELL 1
+#define PHP_ENCHANT_ISPELL 2
+
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO(arginfo_enchant_broker_init, 0)
ZEND_END_ARG_INFO()
@@ -72,6 +71,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_free, 0, 0, 1)
ZEND_ARG_INFO(0, broker)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_set_dict_path, 0, 0, 3)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, name)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_get_dict_path, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_dict, 0, 0, 2)
ZEND_ARG_INFO(0, broker)
ZEND_ARG_INFO(0, tag)
@@ -118,6 +128,8 @@ function_entry enchant_functions[] = {
PHP_FE(enchant_broker_init, arginfo_enchant_broker_init)
PHP_FE(enchant_broker_free, arginfo_enchant_broker_free)
PHP_FE(enchant_broker_get_error, arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_set_dict_path, arginfo_enchant_broker_set_dict_path)
+ PHP_FE(enchant_broker_get_dict_path, arginfo_enchant_broker_get_dict_path)
PHP_FE(enchant_broker_list_dicts, arginfo_enchant_broker_free)
PHP_FE(enchant_broker_request_dict, arginfo_enchant_broker_request_dict)
PHP_FE(enchant_broker_request_pwl_dict, arginfo_enchant_broker_request_pwl_dict)
@@ -277,7 +289,8 @@ PHP_MINIT_FUNCTION(enchant)
{
le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, "enchant_broker", module_number);
le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, "enchant_dict", module_number);
-
+ REGISTER_LONG_CONSTANT("ENCHANT_MYSPELL", PHP_ENCHANT_MYSPELL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("ENCHANT_ISPELL", PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
@@ -309,7 +322,12 @@ PHP_MINFO_FUNCTION(enchant)
php_info_print_table_start();
php_info_print_table_header(2, "enchant support", "enabled");
php_info_print_table_row(2, "Version", PHP_ENCHANT_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision: 1.19.2.3 $");
+#ifdef ENCHANT_VERSION_STRING
+ php_info_print_table_row(2, "Libenchant Version", ENCHANT_VERSION_STRING);
+#elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
+ php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
+#endif
+ php_info_print_table_row(2, "Revision", "$Revision: 289597 $");
php_info_print_table_end();
php_info_print_table_start();
@@ -397,15 +415,101 @@ PHP_FUNCTION(enchant_broker_get_error)
}
/* }}} */
+#if HAVE_ENCHANT_BROKER_SET_PARAM
+/* {{{ proto bool enchant_broker_set_dict_path(resource broker, int dict_type, string value)
+ Set the directory path for a given backend, works with ispell and myspell */
+PHP_FUNCTION(enchant_broker_set_dict_path)
+{
+ zval *broker;
+ enchant_broker *pbroker;
+ long dict_type;
+ char *value;
+ int value_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &broker, &dict_type, &value, &value_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (!value_len) {
+ RETURN_FALSE;
+ }
+
+ switch (dict_type) {
+ case PHP_ENCHANT_MYSPELL:
+ PHP_ENCHANT_GET_BROKER;
+ enchant_broker_set_param(pbroker->pbroker, "enchant.myspell.dictionary.path", (const char *)value);
+ RETURN_TRUE;
+ break;
+
+ case PHP_ENCHANT_ISPELL:
+ PHP_ENCHANT_GET_BROKER;
+ enchant_broker_set_param(pbroker->pbroker, "enchant.ispell.dictionary.path", (const char *)value);
+ RETURN_TRUE;
+ break;
+
+ default:
+ RETURN_FALSE;
+ }
+}
+/* }}} */
+
+
+/* {{{ proto string enchant_broker_get_dict_path(resource broker, int dict_type)
+ Get the directory path for a given backend, works with ispell and myspell */
+PHP_FUNCTION(enchant_broker_get_dict_path)
+{
+ zval *broker;
+ enchant_broker *pbroker;
+ long dict_type;
+ char *value;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &broker, &dict_type) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ switch (dict_type) {
+ case PHP_ENCHANT_MYSPELL:
+ PHP_ENCHANT_GET_BROKER;
+ value = enchant_broker_get_param(pbroker->pbroker, "enchant.myspell.dictionary.path");
+ break;
+
+ case PHP_ENCHANT_ISPELL:
+ PHP_ENCHANT_GET_BROKER;
+ value = enchant_broker_get_param(pbroker->pbroker, "enchant.ispell.dictionary.path");
+ break;
+
+ default:
+ RETURN_FALSE;
+ }
+
+ RETURN_STRING(value, 1);
+}
+/* }}} */
+#else
+/* {{{ proto bool enchant_broker_set_dict_path(resource broker, int dict_type, string value)
+ Set the directory path for a given backend, works with ispell and myspell */
+PHP_FUNCTION(enchant_broker_set_dict_path)
+{
+ RETURN_FALSE;
+}
+/* }}} */
+
+
+/* {{{ proto string enchant_broker_get_dict_path(resource broker, int dict_type)
+ Get the directory path for a given backend, works with ispell and myspell */
+PHP_FUNCTION(enchant_broker_get_dict_path)
+{
+ RETURN_FALSE;
+}
+/* }}} */
+#endif
+
/* {{{ proto string enchant_broker_list_dicts(resource broker)
Lists the dictionaries available for the given broker */
PHP_FUNCTION(enchant_broker_list_dicts)
{
zval *broker;
enchant_broker *pbroker;
- EnchantDictDescribeFn describetozval = php_enchant_list_dicts_fn;
-
- char *msg;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &broker) == FAILURE) {
RETURN_FALSE;
diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h
index 1b8712fbb..0f27db94e 100644
--- a/ext/enchant/php_enchant.h
+++ b/ext/enchant/php_enchant.h
@@ -15,7 +15,7 @@
| Author: Pierre-Alain Joye <paj@pearfr.org> |
+----------------------------------------------------------------------+
- $Id: php_enchant.h,v 1.4.2.1 2009/01/30 00:16:32 felipe Exp $
+ $Id: php_enchant.h 289597 2009-10-12 22:35:36Z pajoye $
*/
#ifndef PHP_ENCHANT_H
@@ -24,7 +24,7 @@
extern zend_module_entry enchant_module_entry;
#define phpext_enchant_ptr &enchant_module_entry
-#define PHP_ENCHANT_VERSION "1.0.2-dev"
+#define PHP_ENCHANT_VERSION "1.1.0"
#ifdef PHP_WIN32
#define PHP_ENCHANT_API __declspec(dllexport)
@@ -36,9 +36,6 @@ extern zend_module_entry enchant_module_entry;
#include "TSRM.h"
#endif
-static void php_enchant_broker_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-static void php_enchant_dict_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-
PHP_MINIT_FUNCTION(enchant);
PHP_MSHUTDOWN_FUNCTION(enchant);
PHP_MINFO_FUNCTION(enchant);
@@ -46,6 +43,8 @@ PHP_MINFO_FUNCTION(enchant);
PHP_FUNCTION(enchant_broker_init);
PHP_FUNCTION(enchant_broker_free);
PHP_FUNCTION(enchant_broker_get_error);
+PHP_FUNCTION(enchant_broker_set_dict_path);
+PHP_FUNCTION(enchant_broker_get_dict_path);
PHP_FUNCTION(enchant_broker_list_dicts);
PHP_FUNCTION(enchant_broker_request_dict);
PHP_FUNCTION(enchant_broker_request_pwl_dict);
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-26 09:11:25 +0000