gluke Tue Jul 8 09:28:16 2003 EDT
Modified files:
/php-src/ext/mnogosearch php_mnogo.c
Log:
- Udm_Find function is fixed to be compatible with mnogosearch-3.2.13
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.76
php-src/ext/mnogosearch/php_mnogo.c:1.77
--- php-src/ext/mnogosearch/php_mnogo.c:1.76 Mon Jun 30 13:12:17 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Tue Jul 8 09:28:16 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.76 2003/06/30 17:12:17 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.77 2003/07/08 13:28:16 gluke Exp $ */
/*
+----------------------------------------------------------------------+
@@ -439,7 +439,7 @@
return res;
}
-/* {{{ proto resource udm_alloc_agent(string dbaddr [, string dbmode])
+/* {{{ proto int udm_alloc_agent(string dbaddr [, string dbmode])
Allocate mnoGoSearch session */
DLEXPORT PHP_FUNCTION(udm_alloc_agent)
{
@@ -561,7 +561,7 @@
}
/* }}} */
-/* {{{ proto bool udm_set_agent_param(resource agent, int var, string val)
+/* {{{ proto int udm_set_agent_param(int agent, int var, string val)
Set mnoGoSearch agent session parameters */
DLEXPORT PHP_FUNCTION(udm_set_agent_param)
{
@@ -1092,7 +1092,7 @@
}
/* }}} */
-/* {{{ proto bool udm_load_ispell_data(resource agent, int var, string val1 [, string
charset], string val2, int flag)
+/* {{{ proto int udm_load_ispell_data(int agent, int var, string val1, [string
charset], string val2, int flag)
Load ispell data */
DLEXPORT PHP_FUNCTION(udm_load_ispell_data)
{
@@ -1235,7 +1235,7 @@
}
/* }}} */
-/* {{{ proto bool udm_free_ispell_data(resource agent)
+/* {{{ proto int udm_free_ispell_data(int agent)
Free memory allocated for ispell data */
DLEXPORT PHP_FUNCTION(udm_free_ispell_data)
{
@@ -1265,7 +1265,7 @@
}
/* }}} */
-/* {{{ proto bool udm_add_search_limit(resource agent, int var, string val)
+/* {{{ proto int udm_add_search_limit(int agent, int var, string val)
Add mnoGoSearch search restrictions */
DLEXPORT PHP_FUNCTION(udm_add_search_limit)
{
@@ -1364,7 +1364,7 @@
}
/* }}} */
-/* {{{ proto bool udm_clear_search_limits(resource agent)
+/* {{{ proto int udm_clear_search_limits(int agent)
Clear all mnoGoSearch search restrictions */
DLEXPORT PHP_FUNCTION(udm_clear_search_limits)
{
@@ -1403,7 +1403,7 @@
/* }}} */
#if UDM_VERSION_ID >= 30200
-/* {{{ proto bool udm_check_charset(resource agent, string charset)
+/* {{{ proto int udm_check_charset(int agent, string charset)
Check if the given charset is known to mnogosearch */
DLEXPORT PHP_FUNCTION(udm_check_charset)
{
@@ -1436,7 +1436,7 @@
#endif
#if UDM_VERSION_ID >= 30203
-/* {{{ proto string udm_crc32(resource agent, string str)
+/* {{{ proto int udm_crc32(int agent, string str)
Return CRC32 checksum of gived string */
DLEXPORT PHP_FUNCTION(udm_crc32)
{
@@ -1482,7 +1482,7 @@
}
-/* {{{ proto int udm_open_stored(resource agent, string storedaddr)
+/* {{{ proto int udm_open_stored(int agent, string storedaddr)
Open connection to stored */
DLEXPORT PHP_FUNCTION(udm_open_stored)
{
@@ -1523,7 +1523,7 @@
}
/* }}} */
-/* {{{ proto bool udm_close_stored(resource agent, int link)
+/* {{{ proto int udm_close_stored(int agent, int link)
Open connection to stored */
DLEXPORT PHP_FUNCTION(udm_close_stored)
{
@@ -1559,7 +1559,7 @@
}
/* }}} */
-/* {{{ proto int udm_check_stored(resource agent, int link, string doc_id)
+/* {{{ proto int udm_check_stored(int agent, int link, string doc_id)
Open connection to stored */
DLEXPORT PHP_FUNCTION(udm_check_stored)
{
@@ -1601,7 +1601,7 @@
#endif
#if UDM_VERSION_ID >= 30204
-/* {{{ proto bool udm_parse_query_string(resource agent, string str)
+/* {{{ proto int udm_parse_query_string(int agent, string str)
Parses query string, initialises variables and search limits taken from it */
DLEXPORT PHP_FUNCTION(udm_parse_query_string)
{
@@ -1630,7 +1630,7 @@
}
/* }}} */
-/* {{{ proto bool udm_make_excerpt(resource agent, resource res, int row)
+/* {{{ proto int udm_make_excerpt(int agent, int res, int row)
Perform search */
DLEXPORT PHP_FUNCTION(udm_make_excerpt)
{
@@ -1686,7 +1686,7 @@
}
/* }}} */
-/* {{{ proto bool udm_set_agent_param_ex(resource agent, string var, string val)
+/* {{{ proto int udm_set_agent_param_ex(int agent, string var, string val)
Set mnoGoSearch agent session parameters extended */
DLEXPORT PHP_FUNCTION(udm_set_agent_param_ex)
{
@@ -1744,7 +1744,7 @@
RETURN_TRUE;
}
-/* {{{ proto string udm_get_res_field_ex(resource res, int row, string field)
+/* {{{ proto string udm_get_res_field_ex(int res, int row, string field)
Fetch mnoGoSearch result field */
DLEXPORT PHP_FUNCTION(udm_get_res_field_ex)
{
@@ -1788,7 +1788,7 @@
#endif
#if UDM_VERSION_ID >= 30211
-/* {{{ proto resource udm_alloc_agent_array(array dbaddr)
+/* {{{ proto int udm_alloc_agent_array(array dbaddr)
Allocate mnoGoSearch session */
DLEXPORT PHP_FUNCTION(udm_alloc_agent_array)
{
@@ -1839,7 +1839,7 @@
}
/* }}} */
-/* {{{ proto string udm_hash32(resource agent, string str)
+/* {{{ proto int udm_hash32(int agent, string str)
Return Hash32 checksum of gived string */
DLEXPORT PHP_FUNCTION(udm_hash32)
{
@@ -1873,7 +1873,7 @@
/* }}} */
#endif
-/* {{{ proto resource udm_find(resource agent, string query)
+/* {{{ proto int udm_find(int agent, string query)
Perform search */
DLEXPORT PHP_FUNCTION(udm_find)
{
@@ -1883,6 +1883,14 @@
int id=-1;
switch(ZEND_NUM_ARGS()){
+#if UDM_VERSION_ID >= 30213
+ case 1: {
+ if (zend_get_parameters_ex(1, &yyagent)==FAILURE) {
+ RETURN_FALSE;
+ }
+ }
+ break;
+#endif
case 2: {
if (zend_get_parameters_ex(2,
&yyagent,&yyquery)==FAILURE) {
RETURN_FALSE;
@@ -1899,7 +1907,11 @@
#if UDM_VERSION_ID < 30200
if ((Res=UdmFind(Agent,UdmTolower(Z_STRVAL_PP(yyquery),Agent->charset)))) {
#else
+#if UDM_VERSION_ID >= 30213
+ if ((Res=UdmFind(Agent))) {
+#else
if ((Res=UdmFind(Agent,Z_STRVAL_PP(yyquery)))) {
+#endif
#endif
ZEND_REGISTER_RESOURCE(return_value,Res,le_res);
} else {
@@ -1908,7 +1920,7 @@
}
/* }}} */
-/* {{{ proto string udm_get_res_field(resource res, int row, int field)
+/* {{{ proto string udm_get_res_field(int res, int row, int field)
Fetch mnoGoSearch result field */
DLEXPORT PHP_FUNCTION(udm_get_res_field)
{
@@ -2093,7 +2105,7 @@
}
/* }}} */
-/* {{{ proto mixed udm_get_res_param(resource res, int param)
+/* {{{ proto string udm_get_res_param(int res, int param)
Get mnoGoSearch result parameters */
DLEXPORT PHP_FUNCTION(udm_get_res_param)
{
@@ -2210,7 +2222,7 @@
}
/* }}} */
-/* {{{ proto bool udm_free_res(resource res)
+/* {{{ proto int udm_free_res(int res)
mnoGoSearch free result */
DLEXPORT PHP_FUNCTION(udm_free_res)
{
@@ -2234,7 +2246,7 @@
}
/* }}} */
-/* {{{ proto bool udm_free_agent(resource agent)
+/* {{{ proto int udm_free_agent(int agent)
Free mnoGoSearch session */
DLEXPORT PHP_FUNCTION(udm_free_agent)
{
@@ -2258,7 +2270,7 @@
}
/* }}} */
-/* {{{ proto int udm_errno(resource agent)
+/* {{{ proto int udm_errno(int agent)
Get mnoGoSearch error number */
DLEXPORT PHP_FUNCTION(udm_errno)
{
@@ -2290,7 +2302,7 @@
}
/* }}} */
-/* {{{ proto string udm_error(resource agent)
+/* {{{ proto string udm_error(int agent)
Get mnoGoSearch error message */
DLEXPORT PHP_FUNCTION(udm_error)
{
@@ -2325,7 +2337,7 @@
}
/* }}} */
-/* {{{ proto array udm_cat_list(resource agent, string category)
+/* {{{ proto array udm_cat_list(int agent, string category)
Get mnoGoSearch categories list with the same root */
DLEXPORT PHP_FUNCTION(udm_cat_list)
{
@@ -2381,7 +2393,6 @@
add_next_index_stringl(return_value,
C.Category[i].name,strlen(C.Category[i].name),1);
}
} else {
- free(buf);
RETURN_FALSE;
}
}
@@ -2400,7 +2411,7 @@
}
/* }}} */
-/* {{{ proto array udm_cat_path(resource agent, string category)
+/* {{{ proto array udm_cat_path(int agent, string category)
Get mnoGoSearch categories path from the root to the given catgory */
DLEXPORT PHP_FUNCTION(udm_cat_path)
{
@@ -2456,7 +2467,6 @@
add_next_index_stringl(return_value,
C.Category[i].name,strlen(C.Category[i].name),1);
}
} else {
- free(buf);
RETURN_FALSE;
}
}
@@ -2476,7 +2486,7 @@
/* }}} */
#if UDM_VERSION_ID > 30110
-/* {{{ proto int udm_get_doc_count(resource agent)
+/* {{{ proto int udm_get_doc_count(int agent)
Get total number of documents in database */
DLEXPORT PHP_FUNCTION(udm_get_doc_count)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
