[PHP-CVS] cvs: php4 /ext/mnogosearch php_mnogo.c php_mnogo.h test.php
gluke Thu Mar 1 05:26:25 2001 EDT
Modified files:
/php4/ext/mnogosearch php_mnogo.c php_mnogo.h test.php
Log:
Udm_Get_Doc_Count function from mnoGoSearch 3.1.11 has been added.
mnoGoSearch library version printing in phpinfo() has been added.
Example updated.
Index: php4/ext/mnogosearch/php_mnogo.c
diff -u php4/ext/mnogosearch/php_mnogo.c:1.19 php4/ext/mnogosearch/php_mnogo.c:1.20
--- php4/ext/mnogosearch/php_mnogo.c:1.19 Thu Mar 1 03:38:17 2001
+++ php4/ext/mnogosearch/php_mnogo.cThu Mar 1 05:26:25 2001
@@ -1,5 +1,5 @@
/* $Source: /local/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.19 2001/03/01 11:38:17 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.20 2001/03/01 13:26:25 gluke Exp $ */
/*
+--+
@@ -117,6 +117,10 @@
PHP_FE(udm_free_res,NULL)
PHP_FE(udm_free_agent, NULL)
+
+#if UDM_VERSION_ID 30110
+ PHP_FE(udm_get_doc_count, NULL)
+#endif
{NULL, NULL, NULL}
};
@@ -275,8 +279,13 @@
DLEXPORT PHP_MINFO_FUNCTION(mnogosearch)
{
+ char buf[32];
+
php_info_print_table_start();
php_info_print_table_row(2, "mnoGoSearch Support", "enabled" );
+
+ sprintf(buf,"%d", UDM_VERSION_ID);
+ php_info_print_table_row(2, "mnoGoSearch library version", buf );
php_info_print_table_end();
}
@@ -1033,6 +1042,33 @@
RETURN_STRING(UdmDBErrorMsg(Agent-db),1);
}
/* }}} */
+
+
+#if UDM_VERSION_ID 30110
+/* {{{ proto int udm_get_doc_count(int agent)
+ Get total number of documents in database */
+DLEXPORT PHP_FUNCTION(udm_get_doc_count)
+{
+ pval ** yyagent;
+ UDM_AGENT * Agent;
+ int id=-1;
+
+ switch(ZEND_NUM_ARGS()){
+ case 1: {
+ if (zend_get_parameters_ex(1, yyagent)==FAILURE) {
+ RETURN_FALSE;
+ }
+ }
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
+ }
+ ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, id, "mnoGoSearch-Agent",
+le_link);
+ RETURN_LONG(UdmGetDocCount(Agent));
+}
+/* }}} */
+#endif
#endif
Index: php4/ext/mnogosearch/php_mnogo.h
diff -u php4/ext/mnogosearch/php_mnogo.h:1.6 php4/ext/mnogosearch/php_mnogo.h:1.7
--- php4/ext/mnogosearch/php_mnogo.h:1.6Fri Feb 23 02:34:49 2001
+++ php4/ext/mnogosearch/php_mnogo.hThu Mar 1 05:26:25 2001
@@ -1,5 +1,5 @@
/* $Source: /local/repository/php4/ext/mnogosearch/php_mnogo.h,v $ */
-/* $Id: php_mnogo.h,v 1.6 2001/02/23 10:34:49 gluke Exp $ */
+/* $Id: php_mnogo.h,v 1.7 2001/03/01 13:26:25 gluke Exp $ */
/*
+--+
@@ -27,6 +27,9 @@
#if HAVE_MNOGOSEARCH
+#include udm_config.h
+#include udmsearch.h
+
extern zend_module_entry mnogosearch_module_entry;
#define mnogosearch_module_ptr mnogosearch_module_entry
@@ -64,6 +67,10 @@
DLEXPORT PHP_FUNCTION(udm_free_res);
DLEXPORT PHP_FUNCTION(udm_free_agent);
+
+#if UDM_VERSION_ID 30110
+DLEXPORT PHP_FUNCTION(udm_get_doc_count);
+#endif
#else
Index: php4/ext/mnogosearch/test.php
diff -u php4/ext/mnogosearch/test.php:1.14 php4/ext/mnogosearch/test.php:1.15
--- php4/ext/mnogosearch/test.php:1.14 Fri Feb 23 02:53:06 2001
+++ php4/ext/mnogosearch/test.php Thu Mar 1 05:26:25 2001
@@ -1,6 +1,6 @@
!--
$Source: /local/repository/php4/ext/mnogosearch/test.php,v $
-$Id: test.php,v 1.14 2001/02/23 10:53:06 gluke Exp $
+$Id: test.php,v 1.15 2001/03/01 13:26:25 gluke Exp $
--
html
@@ -23,6 +23,8 @@
// DBMode is optional, "single" by default
$udm=Udm_Alloc_Agent("mysql://udm:udm@localhost/udm/",'single');
+
+ print "Total number of urls in database: ".Udm_Get_Doc_Count($udm)."br\n";
// Stage 2: set search parameters
--
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]
[PHP-CVS] cvs: php4 /ext/mnogosearch php_mnogo.c php_mnogo.h test.php
gluke Mon Feb 5 07:15:09 2001 EDT
Modified files:
/php4/ext/mnogosearch php_mnogo.c php_mnogo.h test.php
Log:
Added new Udm_Clear_Search_Limits mnogosearch extension function.
@- Added Udm_Clear_Search_Limits mnoGoSearch extension function.
Index: php4/ext/mnogosearch/php_mnogo.c
diff -u php4/ext/mnogosearch/php_mnogo.c:1.7 php4/ext/mnogosearch/php_mnogo.c:1.8
--- php4/ext/mnogosearch/php_mnogo.c:1.7Mon Feb 5 05:12:15 2001
+++ php4/ext/mnogosearch/php_mnogo.cMon Feb 5 07:15:08 2001
@@ -1,5 +1,5 @@
/* $Source: /local/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.7 2001/02/05 13:12:15 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.8 2001/02/05 15:15:08 gluke Exp $ */
/*
+--+
@@ -72,17 +72,20 @@
function_entry mnogosearch_functions[] = {
PHP_FE(udm_alloc_agent, NULL)
PHP_FE(udm_set_agent_param, NULL)
+
PHP_FE(udm_add_search_limit,NULL)
- PHP_FE(udm_free_agent, NULL)
-
+ PHP_FE(udm_clear_search_limits, NULL)
+
PHP_FE(udm_errno, NULL)
PHP_FE(udm_error, NULL)
PHP_FE(udm_find,NULL)
- PHP_FE(udm_free_res,NULL)
- PHP_FE(udm_get_res_field, NULL)
PHP_FE(udm_get_res_param, NULL)
-
+ PHP_FE(udm_get_res_field, NULL)
+
+ PHP_FE(udm_free_res,NULL)
+ PHP_FE(udm_free_agent, NULL)
+
{NULL, NULL, NULL}
};
@@ -430,6 +433,32 @@
RETURN_FALSE;
break;
}
+ RETURN_TRUE;
+}
+/* }}} */
+
+
+/* {{{ proto int udm_clear_search_limits(int agent)
+ Clear all mnoGoSearch search restrictions */
+DLEXPORT PHP_FUNCTION(udm_clear_search_limits)
+{
+ pval ** yyagent;
+ UDM_AGENT * Agent;
+ switch(ZEND_NUM_ARGS()){
+ case 1: {
+ if (zend_get_parameters_ex(1, yyagent)==FAILURE) {
+ RETURN_FALSE;
+ }
+ }
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
+ }
+ ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent",
+le_link);
+
+ UdmClearLimits(Agent-Conf);
+
RETURN_TRUE;
}
/* }}} */
Index: php4/ext/mnogosearch/php_mnogo.h
diff -u php4/ext/mnogosearch/php_mnogo.h:1.4 php4/ext/mnogosearch/php_mnogo.h:1.5
--- php4/ext/mnogosearch/php_mnogo.h:1.4Mon Feb 5 05:12:15 2001
+++ php4/ext/mnogosearch/php_mnogo.hMon Feb 5 07:15:08 2001
@@ -1,5 +1,5 @@
/* $Source: /local/repository/php4/ext/mnogosearch/php_mnogo.h,v $ */
-/* $Id: php_mnogo.h,v 1.4 2001/02/05 13:12:15 gluke Exp $ */
+/* $Id: php_mnogo.h,v 1.5 2001/02/05 15:15:08 gluke Exp $ */
/*
+--+
@@ -48,16 +48,19 @@
DLEXPORT PHP_FUNCTION(udm_alloc_agent);
DLEXPORT PHP_FUNCTION(udm_set_agent_param);
+
DLEXPORT PHP_FUNCTION(udm_add_search_limit);
-DLEXPORT PHP_FUNCTION(udm_free_agent);
+DLEXPORT PHP_FUNCTION(udm_clear_search_limits);
DLEXPORT PHP_FUNCTION(udm_error);
DLEXPORT PHP_FUNCTION(udm_errno);
DLEXPORT PHP_FUNCTION(udm_find);
-DLEXPORT PHP_FUNCTION(udm_free_res);
DLEXPORT PHP_FUNCTION(udm_get_res_field);
DLEXPORT PHP_FUNCTION(udm_get_res_param);
+
+DLEXPORT PHP_FUNCTION(udm_free_res);
+DLEXPORT PHP_FUNCTION(udm_free_agent);
#else
Index: php4/ext/mnogosearch/test.php
diff -u php4/ext/mnogosearch/test.php:1.5 php4/ext/mnogosearch/test.php:1.6
--- php4/ext/mnogosearch/test.php:1.5 Mon Feb 5 05:12:15 2001
+++ php4/ext/mnogosearch/test.php Mon Feb 5 07:15:08 2001
@@ -1,6 +1,6 @@
!--
$Source: /local/repository/php4/ext/mnogosearch/test.php,v $
-$Id: test.php,v 1.5 2001/02/05 13:12:15 gluke Exp $
+$Id: test.php,v 1.6 2001/02/05 15:15:08 gluke Exp $
--
html
@@ -43,6 +43,8 @@
// Udm_Add_Search_Limit($udm,UDM_LIMIT_TAG,"01");
// Udm_Add_Search_Limit($udm,UDM_LIMIT_CAT,"01");
// Udm_Add_Search_Limit($udm,UDM_LIMIT_LANG,"en");
+
+// Udm_Clear_Search_Limits($udm);
// Stage 4: perform search
--
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]
