gluke           Sun Aug 31 02:58:57 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/mnogosearch    php_mnogo.c 
  Log:
  - mnogosearch extension updated to compile with mnogosearch-3.2.15
  - a new UDM_PARAM_SEARCH_RESULTS mnogosearch API command added to limit
    maximum number of search results
  
  
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.66.2.7 
php-src/ext/mnogosearch/php_mnogo.c:1.66.2.8
--- php-src/ext/mnogosearch/php_mnogo.c:1.66.2.7        Fri Jul 18 05:15:04 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Sun Aug 31 02:58:56 2003
@@ -1,5 +1,5 @@
 /* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.66.2.7 2003/07/18 09:15:04 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.66.2.8 2003/08/31 06:58:56 gluke Exp $ */
 
 /*
    +----------------------------------------------------------------------+
@@ -86,6 +86,7 @@
 #define UDM_PARAM_SITEID               28
 #define UDM_PARAM_DETECT_CLONES                29
 #define UDM_PARAM_SORT_ORDER           30
+#define UDM_PARAM_RESULTS_LIMIT                31
 
 /* udm_add_search_limit constants */
 #define UDM_LIMIT_URL          1
@@ -324,6 +325,7 @@
        REGISTER_LONG_CONSTANT("UDM_PARAM_SITEID",      UDM_PARAM_SITEID,CONST_CS | 
CONST_PERSISTENT);
        
REGISTER_LONG_CONSTANT("UDM_PARAM_DETECT_CLONES",UDM_PARAM_DETECT_CLONES,CONST_CS | 
CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_PARAM_SORT_ORDER",UDM_PARAM_SORT_ORDER,CONST_CS | 
CONST_PERSISTENT);
+       
REGISTER_LONG_CONSTANT("UDM_PARAM_RESULTS_LIMIT",UDM_PARAM_RESULTS_LIMIT,CONST_CS | 
CONST_PERSISTENT);
        
        /* udm_add_search_limit constants */
        REGISTER_LONG_CONSTANT("UDM_LIMIT_CAT",         UDM_LIMIT_CAT,CONST_CS | 
CONST_PERSISTENT);
@@ -462,7 +464,11 @@
 #if UDM_VERSION_ID >= 30204
                                Env=UdmEnvInit(NULL);
                                
UdmVarListReplaceStr(&Env->Vars,"SyslogFacility","local7");
+#if UDM_VERSION_ID >= 30215
+                               UdmSetLogLevel(NULL,0);
+#else
                                UdmSetLogLevel(Env,0);
+#endif
                                UdmOpenLog("mnoGoSearch-php",Env,0);
 #if UDM_VERSION_ID <= 30210
                                if(!memcmp(dbaddr,"searchd:",8)){
@@ -519,7 +525,11 @@
 #if UDM_VERSION_ID >= 30204
                                Env=UdmEnvInit(NULL);
                                
UdmVarListReplaceStr(&Env->Vars,"SyslogFacility","local7");
+#if UDM_VERSION_ID >= 30215
+                               UdmSetLogLevel(NULL,0);
+#else
                                UdmSetLogLevel(Env,0);
+#endif
                                UdmOpenLog("mnoGoSearch-php",Env,0);
 #if UDM_VERSION_ID <= 30210
                                if(!memcmp(dbaddr,"searchd:",8)){
@@ -1092,6 +1102,12 @@
                        break;
 #endif
 
+#if UDM_VERSION_ID >= 30215
+               case UDM_PARAM_RESULTS_LIMIT: 
+                       UdmVarListReplaceStr(&Agent->Conf->Vars,"ResultsLimit",val);
+               
+                       break;
+#endif
                default:
                        php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unknown agent 
session parameter");
                        RETURN_FALSE;
@@ -1823,7 +1839,11 @@
                                
                                Env=UdmEnvInit(NULL);
                                
UdmVarListReplaceStr(&Env->Vars,"SyslogFacility","local7");
+#if UDM_VERSION_ID >= 30215
+                               UdmSetLogLevel(NULL,0);
+#else
                                UdmSetLogLevel(Env,0);
+#endif
                                UdmOpenLog("mnoGoSearch-php",Env,0);
                                
                                
zend_hash_internal_pointer_reset_ex(HASH_OF(*yydbaddr), &pos);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to