diff options
Diffstat (limited to 'ext/pspell')
| -rw-r--r-- | ext/pspell/CREDITS | 2 | ||||
| -rw-r--r-- | ext/pspell/README | 51 | ||||
| -rw-r--r-- | ext/pspell/config.m4 | 36 | ||||
| -rw-r--r-- | ext/pspell/php_pspell.h | 52 | ||||
| -rw-r--r-- | ext/pspell/pspell.c | 819 | ||||
| -rw-r--r-- | ext/pspell/tests/01pspell_basic.phpt | 143 |
6 files changed, 0 insertions, 1103 deletions
diff --git a/ext/pspell/CREDITS b/ext/pspell/CREDITS deleted file mode 100644 index a7919d4b7c..0000000000 --- a/ext/pspell/CREDITS +++ /dev/null @@ -1,2 +0,0 @@ -Pspell -Vlad Krupin diff --git a/ext/pspell/README b/ext/pspell/README deleted file mode 100644 index b7d3adf198..0000000000 --- a/ext/pspell/README +++ /dev/null @@ -1,51 +0,0 @@ -README file for pspell (spellchecker) module for PHP4 ------------------------------------------------------ - -The latest release of pspell is always available from - - http://pspell.sourceforge.net/ - -This module was developed and tested with aspell-.31.1 and pspell-.11.0.2, -although slightly earlier (and hopefully later) versions of those libraries -should work as well. - -General notes -------------- - -Please, note that somewhere around version .27.x (I believe) aspell stopped -working with the aspell module for php. This is due to the fact that the -author changed things around a bit, and suggested that people link to pspell -in the future rather than to aspell. That's exactly what this module is for. -It has the same basic functionality as aspell (and more features are being -added). I did not want to modify existing aspell module, because it would -break things for those who are using older aspell, or result in very ugly code. -Rather, I wrote a new module - pspell. - - -Building pspell on a Unix system --------------------------------- - -In order to use pspell, you need to have *both* aspell and pspell libraries -installed, and they have to be compatible with each other. Get the latest -release of both at the URL given above. - -I expect the libraries to be in /usr/local (that's the default when you -cofigure pspell and aspell with their 'configure' scripts woth no parameters). -If that location is different, please specify it in --with-pspell=PATH, where -PATH is the path you specified for pspell libraries. - -Notes on personalized dictionaries ----------------------------------- - -It is now possible to have personalized dictionaries with pspell. This is -achieved by opening a dictionary with pspell_new_personal() rather than -pspell_new() and specifying the custom dictionary as the first parameter. -The parameter probably should begin with '/' because otherwise it will -be relative to $HOME, which is probably set to "/root". This is probably not -what you want because you need write access for nobody to be able to write -to a dictionary. Once the dictionary is open, you can use -pspell_add_to_personal() to add words to the wordlist and finally -pspell_save_wordlist() to save it. - -Note that at this moment pspell_save_wordlist() will return TRUE, even if -there was an error. This will be changed once pspell library is fixed.
\ No newline at end of file diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4 deleted file mode 100644 index 8c1cbe49b7..0000000000 --- a/ext/pspell/config.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl -dnl $Id$ -dnl - -PHP_ARG_WITH(pspell,for PSPELL support, -[ --with-pspell[=DIR] Include PSPELL support. - This replaces the old ASPELL extension.]) - -if test "$PHP_PSPELL" != "no"; then - PHP_NEW_EXTENSION(pspell, pspell.c, $ext_shared) - if test "$PHP_PSPELL" != "yes"; then - PSPELL_SEARCH_DIRS=$PHP_PSPELL - else - PSPELL_SEARCH_DIRS="/usr/local /usr" - fi - for i in $PSPELL_SEARCH_DIRS; do - if test -f $i/include/pspell/pspell.h; then - PSPELL_DIR=$i - PSPELL_INCDIR=$i/include/pspell - elif test -f $i/include/pspell.h; then - PSPELL_DIR=$i - PSPELL_INCDIR=$i/include - fi - done - - if test -z "$PSPELL_DIR"; then - AC_MSG_ERROR(Cannot find pspell) - fi - - PSPELL_LIBDIR=$PSPELL_DIR/lib - - AC_DEFINE(HAVE_PSPELL,1,[ ]) - PHP_SUBST(PSPELL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) - PHP_ADD_INCLUDE($PSPELL_INCDIR) -fi diff --git a/ext/pspell/php_pspell.h b/ext/pspell/php_pspell.h deleted file mode 100644 index f602978479..0000000000 --- a/ext/pspell/php_pspell.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 4 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2003 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Vlad Krupin <phpdevel@echospace.com> | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#ifndef _PSPELL_H -#define _PSPELL_H -#if HAVE_PSPELL -extern zend_module_entry pspell_module_entry; -#define pspell_module_ptr &pspell_module_entry - -PHP_MINIT_FUNCTION(pspell); -PHP_MINFO_FUNCTION(pspell); -PHP_FUNCTION(pspell_new); -PHP_FUNCTION(pspell_new_personal); -PHP_FUNCTION(pspell_new_config); -PHP_FUNCTION(pspell_check); -PHP_FUNCTION(pspell_suggest); -PHP_FUNCTION(pspell_store_replacement); -PHP_FUNCTION(pspell_add_to_personal); -PHP_FUNCTION(pspell_add_to_session); -PHP_FUNCTION(pspell_clear_session); -PHP_FUNCTION(pspell_save_wordlist); -PHP_FUNCTION(pspell_config_create); -PHP_FUNCTION(pspell_config_runtogether); -PHP_FUNCTION(pspell_config_mode); -PHP_FUNCTION(pspell_config_ignore); -PHP_FUNCTION(pspell_config_personal); -PHP_FUNCTION(pspell_config_repl); -PHP_FUNCTION(pspell_config_save_repl); -#else -#define pspell_module_ptr NULL -#endif - -#define phpext_pspell_ptr pspell_module_ptr - -#endif /* _PSPELL_H */ diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c deleted file mode 100644 index 1d1a6436a9..0000000000 --- a/ext/pspell/pspell.c +++ /dev/null @@ -1,819 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 4 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2003 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Vlad Krupin <phpdevel@echospace.com> | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#define IS_EXT_MODULE - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" - -#include <stdlib.h> -#include <ctype.h> -#include <stdio.h> - -#if HAVE_PSPELL - -/* this will enforce compatibility in .12 version (broken after .11.2) */ -#define USE_ORIGINAL_MANAGER_FUNCS - -#include "php_pspell.h" -#include <pspell.h> -#include "ext/standard/info.h" - -#define PSPELL_FAST 1L -#define PSPELL_NORMAL 2L -#define PSPELL_BAD_SPELLERS 3L -#define PSPELL_SPEED_MASK_INTERNAL 3L -#define PSPELL_RUN_TOGETHER 8L - -/* {{{ pspell_functions[] - */ -function_entry pspell_functions[] = { - PHP_FE(pspell_new, NULL) - PHP_FE(pspell_new_personal, NULL) - PHP_FE(pspell_new_config, NULL) - PHP_FE(pspell_check, NULL) - PHP_FE(pspell_suggest, NULL) - PHP_FE(pspell_store_replacement, NULL) - PHP_FE(pspell_add_to_personal, NULL) - PHP_FE(pspell_add_to_session, NULL) - PHP_FE(pspell_clear_session, NULL) - PHP_FE(pspell_save_wordlist, NULL) - PHP_FE(pspell_config_create, NULL) - PHP_FE(pspell_config_runtogether, NULL) - PHP_FE(pspell_config_mode, NULL) - PHP_FE(pspell_config_ignore, NULL) - PHP_FE(pspell_config_personal, NULL) - PHP_FE(pspell_config_repl, NULL) - PHP_FE(pspell_config_save_repl, NULL) - {NULL, NULL, NULL} -}; -/* }}} */ - -static int le_pspell, le_pspell_config; - -zend_module_entry pspell_module_entry = { - STANDARD_MODULE_HEADER, - "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES -}; - -#ifdef COMPILE_DL_PSPELL -ZEND_GET_MODULE(pspell) -#endif - -static void php_pspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) -{ - PspellManager *manager = (PspellManager *)rsrc->ptr; - - delete_pspell_manager(manager); -} - -static void php_pspell_close_config(zend_rsrc_list_entry *rsrc TSRMLS_DC) -{ - PspellConfig *config = (PspellConfig *)rsrc->ptr; - - delete_pspell_config(config); -} - -/* {{{ PHP_MINIT_FUNCTION - */ -PHP_MINIT_FUNCTION(pspell) -{ - REGISTER_LONG_CONSTANT("PSPELL_FAST", PSPELL_FAST, CONST_PERSISTENT | CONST_CS); - REGISTER_LONG_CONSTANT("PSPELL_NORMAL", PSPELL_NORMAL, CONST_PERSISTENT | CONST_CS); - REGISTER_LONG_CONSTANT("PSPELL_BAD_SPELLERS", PSPELL_BAD_SPELLERS, CONST_PERSISTENT | CONST_CS); - REGISTER_LONG_CONSTANT("PSPELL_RUN_TOGETHER", PSPELL_RUN_TOGETHER, CONST_PERSISTENT | CONST_CS); - le_pspell = zend_register_list_destructors_ex(php_pspell_close, NULL, "pspell", module_number); - le_pspell_config = zend_register_list_destructors_ex(php_pspell_close_config, NULL, "pspell config", module_number); - return SUCCESS; -} -/* }}} */ - -/* {{{ proto int pspell_new(string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) - Load a dictionary */ -PHP_FUNCTION(pspell_new) -{ - zval **language,**spelling,**jargon,**encoding,**pmode; - long mode = 0L, speed = 0L; - int argc; - int ind; - - PspellCanHaveError *ret; - PspellManager *manager; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 5 || zend_get_parameters_ex(argc,&language,&spelling,&jargon,&encoding,&pmode) == FAILURE) { - WRONG_PARAM_COUNT; - } - - config = new_pspell_config(); - convert_to_string_ex(language); - pspell_config_replace(config, "language-tag", Z_STRVAL_PP(language)); - - if(argc > 1){ - convert_to_string_ex(spelling); - if(Z_STRLEN_PP(spelling) > 0){ - pspell_config_replace(config, "spelling", Z_STRVAL_PP(spelling)); - } - } - - if(argc > 2){ - convert_to_string_ex(jargon); - if(Z_STRLEN_PP(jargon) > 0){ - pspell_config_replace(config, "jargon", Z_STRVAL_PP(jargon)); - } - } - - if(argc > 3){ - convert_to_string_ex(encoding); - if(Z_STRLEN_PP(encoding) > 0){ - pspell_config_replace(config, "encoding", Z_STRVAL_PP(encoding)); - } - } - - if(argc > 4){ - convert_to_long_ex(pmode); - mode = Z_LVAL_PP(pmode); - speed = mode & PSPELL_SPEED_MASK_INTERNAL; - - /* First check what mode we want (how many suggestions) */ - if(speed == PSPELL_FAST){ - pspell_config_replace(config, "sug-mode", "fast"); - }else if(speed == PSPELL_NORMAL){ - pspell_config_replace(config, "sug-mode", "normal"); - }else if(speed == PSPELL_BAD_SPELLERS){ - pspell_config_replace(config, "sug-mode", "bad-spellers"); - } - - /* Then we see if run-together words should be treated as valid components */ - if(mode & PSPELL_RUN_TOGETHER){ - pspell_config_replace(config, "run-together", "true"); - } - } - - ret = new_pspell_manager(config); - delete_pspell_config(config); - - if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); - RETURN_FALSE; - } - - manager = to_pspell_manager(ret); - ind = zend_list_insert(manager, le_pspell); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto int pspell_new_personal(string personal, string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) - Load a dictionary with a personal wordlist*/ -PHP_FUNCTION(pspell_new_personal) -{ - zval **personal, **language,**spelling,**jargon,**encoding,**pmode; - long mode = 0L, speed = 0L; - int argc; - int ind; - - PspellCanHaveError *ret; - PspellManager *manager; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc < 2 || argc > 6 || zend_get_parameters_ex(argc,&personal,&language,&spelling,&jargon,&encoding,&pmode) == FAILURE) { - WRONG_PARAM_COUNT; - } - - config = new_pspell_config(); - - convert_to_string_ex(personal); - pspell_config_replace(config, "personal", Z_STRVAL_PP(personal)); - pspell_config_replace(config, "save-repl", "false"); - - convert_to_string_ex(language); - pspell_config_replace(config, "language-tag", Z_STRVAL_PP(language)); - - if(argc > 2){ - convert_to_string_ex(spelling); - if(Z_STRLEN_PP(spelling) > 0){ - pspell_config_replace(config, "spelling", Z_STRVAL_PP(spelling)); - } - } - - if(argc > 3){ - convert_to_string_ex(jargon); - if(Z_STRLEN_PP(jargon) > 0){ - pspell_config_replace(config, "jargon", Z_STRVAL_PP(jargon)); - } - } - - if(argc > 4){ - convert_to_string_ex(encoding); - if(Z_STRLEN_PP(encoding) > 0){ - pspell_config_replace(config, "encoding", Z_STRVAL_PP(encoding)); - } - } - - if(argc > 5){ - convert_to_long_ex(pmode); - mode = Z_LVAL_PP(pmode); - speed = mode & PSPELL_SPEED_MASK_INTERNAL; - - /* First check what mode we want (how many suggestions) */ - if(speed == PSPELL_FAST){ - pspell_config_replace(config, "sug-mode", "fast"); - }else if(speed == PSPELL_NORMAL){ - pspell_config_replace(config, "sug-mode", "normal"); - }else if(speed == PSPELL_BAD_SPELLERS){ - pspell_config_replace(config, "sug-mode", "bad-spellers"); - } - - /* Then we see if run-together words should be treated as valid components */ - if(mode & PSPELL_RUN_TOGETHER){ - pspell_config_replace(config, "run-together", "true"); - } - } - - ret = new_pspell_manager(config); - delete_pspell_config(config); - - if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); - RETURN_FALSE; - } - - manager = to_pspell_manager(ret); - ind = zend_list_insert(manager, le_pspell); - - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto int pspell_new_config(int config) - Load a dictionary based on the given config */ -PHP_FUNCTION(pspell_new_config) -{ - int type; - zval **conf; - int argc; - int ind; - - PspellCanHaveError *ret; - PspellManager *manager; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 1 || zend_get_parameters_ex(argc,&conf) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(conf); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); - ret = new_pspell_manager(config); - - if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); - RETURN_FALSE; - } - - manager = to_pspell_manager(ret); - ind = zend_list_insert(manager, le_pspell); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto int pspell_check(int pspell, string word) - Returns true if word is valid */ -PHP_FUNCTION(pspell_check) -{ - int type; - zval **scin,**word; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - convert_to_string_ex(word); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - if(pspell_manager_check(manager, Z_STRVAL_PP(word))){ - RETURN_TRUE; - }else{ - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto array pspell_suggest(int pspell, string word) - Returns array of suggestions */ -PHP_FUNCTION(pspell_suggest) -{ - zval **scin, **word; - int argc; - PspellManager *manager; - int type; - const PspellWordList *wl; - const char *sug; - - argc = ZEND_NUM_ARGS(); - if(argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - convert_to_string_ex(word); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - array_init(return_value); - - wl = pspell_manager_suggest(manager, Z_STRVAL_PP(word)); - if(wl){ - PspellStringEmulation *els = pspell_word_list_elements(wl); - while((sug = pspell_string_emulation_next(els)) != 0){ - add_next_index_string(return_value,(char *)sug,1); - } - delete_pspell_string_emulation(els); - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL had a problem. details: %s ", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto int pspell_store_replacement(int pspell, string misspell, string correct) - Notify the dictionary of a user-selected replacement */ -PHP_FUNCTION(pspell_store_replacement) -{ - int type; - zval **scin,**miss,**corr; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 3 || zend_get_parameters_ex(argc, &scin,&miss,&corr) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - convert_to_string_ex(miss); - convert_to_string_ex(corr); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss), Z_STRVAL_PP(corr)); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_store_replacement() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto int pspell_add_to_personal(int pspell, string word) - Adds a word to a personal list */ -PHP_FUNCTION(pspell_add_to_personal) -{ - int type; - zval **scin,**word; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - convert_to_string_ex(word); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ - RETURN_FALSE; - } - - pspell_manager_add_to_personal(manager, Z_STRVAL_PP(word)); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_add_to_personal() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto int pspell_add_to_session(int pspell, string word) - Adds a word to the current session */ -PHP_FUNCTION(pspell_add_to_session) -{ - int type; - zval **scin,**word; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - convert_to_string_ex(word); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ - RETURN_FALSE; - } - - pspell_manager_add_to_session(manager, Z_STRVAL_PP(word)); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_add_to_session() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto int pspell_clear_session(int pspell) - Clears the current session */ -PHP_FUNCTION(pspell_clear_session) -{ - int type; - zval **scin; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 1 || zend_get_parameters_ex(argc, &scin) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - pspell_manager_clear_session(manager); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_clear_session() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto int pspell_save_wordlist(int pspell) - Saves the current (personal) wordlist */ -PHP_FUNCTION(pspell_save_wordlist) -{ - int type; - zval **scin; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 1 || zend_get_parameters_ex(argc, &scin) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(scin); - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); - if(!manager){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL result index",Z_LVAL_PP(scin)); - RETURN_FALSE; - } - - pspell_manager_save_all_word_lists(manager); - - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_save_wordlist() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } - -} -/* }}} */ - -/* {{{ proto int pspell_config_create(string language [, string spelling [, string jargon [, string encoding]]]) - Create a new config to be used later to create a manager */ -PHP_FUNCTION(pspell_config_create) -{ - zval **language,**spelling,**jargon,**encoding; - int argc; - int ind; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 4 || zend_get_parameters_ex(argc,&language,&spelling,&jargon,&encoding) == FAILURE) { - WRONG_PARAM_COUNT; - } - - config = new_pspell_config(); - convert_to_string_ex(language); - pspell_config_replace(config, "language-tag", Z_STRVAL_PP(language)); - - if(argc > 1){ - convert_to_string_ex(spelling); - if(Z_STRLEN_PP(spelling) > 0){ - pspell_config_replace(config, "spelling", Z_STRVAL_PP(spelling)); - } - } - - if(argc > 2){ - convert_to_string_ex(jargon); - if(Z_STRLEN_PP(jargon) > 0){ - pspell_config_replace(config, "jargon", Z_STRVAL_PP(jargon)); - } - } - - if(argc > 3){ - convert_to_string_ex(encoding); - if(Z_STRLEN_PP(encoding) > 0){ - pspell_config_replace(config, "encoding", Z_STRVAL_PP(encoding)); - } - } - - /* By default I do not want to write anything anywhere because it'll try to write to $HOME - which is not what we want */ - pspell_config_replace(config, "save-repl", "false"); - - ind = zend_list_insert(config, le_pspell_config); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto int pspell_config_runtogether(int conf, bool runtogether) - Consider run-together words as valid components */ -PHP_FUNCTION(pspell_config_runtogether) -{ - int type; - zval **sccin, **runtogether; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&runtogether) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(sccin); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); - if(!config){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL config index",Z_LVAL_PP(sccin)); - RETURN_FALSE; - } - - convert_to_boolean_ex(runtogether); - pspell_config_replace(config, "run-together", Z_LVAL_PP(runtogether) ? "true" : "false"); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto int pspell_config_mode(int conf, long mode) - Select mode for config (PSPELL_FAST, PSPELL_NORMAL or PSPELL_BAD_SPELLERS) */ -PHP_FUNCTION(pspell_config_mode) -{ - int type; - zval **sccin, **mode; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&mode) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(sccin); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); - if(!config){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL config index",Z_LVAL_PP(sccin)); - RETURN_FALSE; - } - - convert_to_long_ex(mode); - - /* First check what mode we want (how many suggestions) */ - if(Z_LVAL_PP(mode) == PSPELL_FAST){ - pspell_config_replace(config, "sug-mode", "fast"); - }else if(Z_LVAL_PP(mode) == PSPELL_NORMAL){ - pspell_config_replace(config, "sug-mode", "normal"); - }else if(Z_LVAL_PP(mode) == PSPELL_BAD_SPELLERS){ - pspell_config_replace(config, "sug-mode", "bad-spellers"); - } - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto int pspell_config_ignore(int conf, int ignore) - Ignore words <= n chars */ -PHP_FUNCTION(pspell_config_ignore) -{ - int type; - zval **sccin, **pignore; - int argc; - - /* Hack. But I cannot imagine any word being more than 999 characters long */ - int loc = 3; - char ignore_str[loc + 1]; - long ignore = 0L; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&pignore) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(sccin); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); - if(!config){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL config index",Z_LVAL_PP(sccin)); - RETURN_FALSE; - } - - convert_to_long_ex(pignore); - ignore = Z_LVAL_PP(pignore); - - /* The following is a very hackish way to convert a long to a string - (actually only the numbers 0-999 will get converted properly, but that should - be sufficient). If anyone knows of a better way to convert an integer to a string, - please, fix it.*/ - ignore_str[loc] = '\0'; - while(ignore > 0){ - if(loc == 0){ - break; - } - ignore_str[--loc] = '0' + (ignore % 10); - ignore /= 10; - } - if(ignore_str[loc] == '\0'){ - ignore_str[--loc] = '0'; - } - - pspell_config_replace(config, "ignore", &ignore_str[loc]); - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto int pspell_config_personal(int conf, string personal) - Use a personal dictionary for this config */ -PHP_FUNCTION(pspell_config_personal) -{ - int type; - zval **sccin, **personal; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&personal) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(sccin); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); - if(!config){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL config index",Z_LVAL_PP(sccin)); - RETURN_FALSE; - } - - convert_to_string_ex(personal); - pspell_config_replace(config, "personal", Z_STRVAL_PP(personal)); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto int pspell_config_repl(int conf, string repl) - Use a personal dictionary with replacement pairs for this config */ -PHP_FUNCTION(pspell_config_repl) -{ - int type; - zval **sccin, **repl; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&repl) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(sccin); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); - if(!config){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL config index",Z_LVAL_PP(sccin)); - RETURN_FALSE; - } - - pspell_config_replace(config, "save-repl", "true"); - - convert_to_string_ex(repl); - pspell_config_replace(config, "repl", Z_STRVAL_PP(repl)); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto int pspell_config_save_repl(int conf, bool save) - Save replacement pairs when personal list is saved for this config */ -PHP_FUNCTION(pspell_config_save_repl) -{ - int type; - zval **sccin, **save; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&save) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_long_ex(sccin); - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); - if(!config){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not an PSPELL config index",Z_LVAL_PP(sccin)); - RETURN_FALSE; - } - - convert_to_boolean_ex(save); - pspell_config_replace(config, "save-repl", Z_LVAL_PP(save) ? "true" : "false"); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ PHP_MINFO_FUNCTION - */ -PHP_MINFO_FUNCTION(pspell) -{ - php_info_print_table_start(); - php_info_print_table_row(2, "PSpell Support", "enabled"); - php_info_print_table_end(); -} -/* }}} */ - -#endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/ext/pspell/tests/01pspell_basic.phpt b/ext/pspell/tests/01pspell_basic.phpt deleted file mode 100644 index 5efccab8fa..0000000000 --- a/ext/pspell/tests/01pspell_basic.phpt +++ /dev/null @@ -1,143 +0,0 @@ ---TEST-- -pspell basic tests ---SKIPIF-- -<?php - if (!extension_loaded("pspell")) print "skip"; - if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) { - die("skip English dictionary is not avaliable"); - } -?> ---POST-- ---GET-- ---FILE-- -<?php // $Id$ - -error_reporting(E_ALL); -$string = ""; -$string .= "I will not buy this record, it is scratched. "; -$string .= "Sorry "; -$string .= "I will not buy this record, it is scratched. "; -$string .= "Uh, no, no, no. This is a tobacconist's "; -$string .= "Ah! I will not buy this tobacconist's, it is scratched. "; -$string .= "No, no, no, no. Tobacco... um... cigarettes (holds up a pack). "; -$string .= "Ya! See-gar-ets! Ya! Uh... My hovercraft is full of eels. "; -$string .= "Sorry? "; -$string .= "My hovercraft (pantomimes puffing a cigarette)... is full of eels (pretends to strike a match). "; -$string .= "Ahh, matches!"; - -$pspell = pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER)); -$array = explode(' ',preg_replace('/[^a-zA-Z0-9 ]/','',$string)); -for($i=0,$u=count($array);$i<$u;++$i) { - echo $array[$i].' : '; - if (!pspell_check($pspell, $array[$i])) { - echo "..false\n"; - $suggestions = pspell_suggest ($pspell, $array[$i]); - - foreach ($suggestions as $suggestion) { - echo "Possible spelling: $suggestion\n"; - } - } else { - echo "true\n"; - } -} - ---EXPECT-- -I : true -will : true -not : true -buy : true -this : true -record : true -it : true -is : true -scratched : true -Sorry : true -I : true -will : true -not : true -buy : true -this : true -record : true -it : true -is : true -scratched : true -Uh : true -no : true -no : true -no : true -This : true -is : true -a : true -tobacconists : true -Ah : true -I : true -will : true -not : true -buy : true -this : true -tobacconists : true -it : true -is : true -scratched : true -No : true -no : true -no : true -no : true -Tobacco : true -um : true -cigarettes : true -holds : true -up : true -a : true -pack : true -Ya : true -Seegarets : ..false -Possible spelling: Secrets -Possible spelling: Regrets -Possible spelling: Secretes -Possible spelling: Egrets -Possible spelling: Serrates -Possible spelling: Segre's -Possible spelling: Seagate's -Possible spelling: Regreets -Possible spelling: Segregates -Possible spelling: Sergeants -Possible spelling: Sugariest -Possible spelling: Garrets -Possible spelling: Socrates -Possible spelling: Egret's -Possible spelling: Separates -Possible spelling: Cigarettes -Possible spelling: Sugared -Possible spelling: Scarlets -Ya : true -Uh : true -My : true -hovercraft : true -is : true -full : true -of : true -eels : true -Sorry : true -My : true -hovercraft : true -pantomimes : true -puffing : true -a : true -cigarette : true -is : true -full : true -of : true -eels : true -pretends : true -to : true -strike : true -a : true -match : true -Ahh : ..false -Possible spelling: Shh -Possible spelling: Ah -Possible spelling: Aha -Possible spelling: Ash -Possible spelling: Ha -matches : true |