Added UDM_PARAM_SEARCHTIME result parameter.

Now at least mnoGoSearch-3.1.10 required to use this module.
Added some parameters aliases. Example updated.

diff --git a/ext/mnogosearch/php_mnogo.c b/ext/mnogosearch/php_mnogo.c
index 1685a7aa6093942450c6efb6477f9d3099ad5502..758faac4dcb6d27ff81d6df1d737e8b5aebfb20a 100644 (file)
--- a/ext/mnogosearch/php_mnogo.c
+++ b/ext/mnogosearch/php_mnogo.c
@@ -36,14 +36,12 @@
 #define UDM_FIELD_TITLE                4
 #define UDM_FIELD_KEYWORDS     5
 #define UDM_FIELD_DESC         6
-#define UDM_FIELD_DESCRIPTION  7
-#define UDM_FIELD_TEXT         8
-#define UDM_FIELD_SIZE         9
-#define UDM_FIELD_SCORE                10
-#define UDM_FIELD_RATING       11
-#define UDM_FIELD_MODIFIED     12
-#define UDM_FIELD_ORDER                13
-#define UDM_FIELD_CRC          14
+#define UDM_FIELD_TEXT         7
+#define UDM_FIELD_SIZE         8
+#define UDM_FIELD_RATING       9
+#define UDM_FIELD_MODIFIED     10
+#define UDM_FIELD_ORDER                11
+#define UDM_FIELD_CRC          12
 
 /* udm_set_agent_param constants */
 #define UDM_PARAM_PAGE_SIZE    1
@@ -68,6 +66,7 @@
 #define UDM_PARAM_NUM_ROWS     256
 #define UDM_PARAM_FOUND                257
 #define UDM_PARAM_WORDINFO     258
+#define UDM_PARAM_SEARCHTIME   259
 
 /* True globals, no need for thread safety */
 static int le_link,le_res;
@@ -134,11 +133,11 @@ DLEXPORT PHP_MINIT_FUNCTION(mnogosearch)
        REGISTER_LONG_CONSTANT("UDM_FIELD_TITLE",       UDM_FIELD_TITLE,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_KEYWORDS",    UDM_FIELD_KEYWORDS,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_DESC",        UDM_FIELD_DESC,CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("UDM_FIELD_DESCRIPTION", UDM_FIELD_DESCRIPTION,CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("UDM_FIELD_DESCRIPTION", UDM_FIELD_DESC,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_TEXT",        UDM_FIELD_TEXT,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_SIZE",        UDM_FIELD_SIZE,CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("UDM_FIELD_SCORE",       UDM_FIELD_SCORE,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_RATING",      UDM_FIELD_RATING,CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("UDM_FIELD_SCORE",       UDM_FIELD_RATING,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_MODIFIED",    UDM_FIELD_MODIFIED,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_ORDER",       UDM_FIELD_ORDER,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_FIELD_CRC",         UDM_FIELD_CRC,CONST_CS | CONST_PERSISTENT);
@@ -151,7 +150,9 @@ DLEXPORT PHP_MINIT_FUNCTION(mnogosearch)
        REGISTER_LONG_CONSTANT("UDM_PARAM_TRACK_MODE",  UDM_PARAM_TRACK_MODE,CONST_CS | CONST_PERSISTENT);      
        REGISTER_LONG_CONSTANT("UDM_PARAM_CHARSET",     UDM_PARAM_CHARSET,CONST_CS | CONST_PERSISTENT); 
        REGISTER_LONG_CONSTANT("UDM_PARAM_STOPTABLE",   UDM_PARAM_STOPTABLE,CONST_CS | CONST_PERSISTENT);       
+       REGISTER_LONG_CONSTANT("UDM_PARAM_STOP_TABLE",  UDM_PARAM_STOPTABLE,CONST_CS | CONST_PERSISTENT);       
        REGISTER_LONG_CONSTANT("UDM_PARAM_STOPFILE",    UDM_PARAM_STOPFILE,CONST_CS | CONST_PERSISTENT);        
+       REGISTER_LONG_CONSTANT("UDM_PARAM_STOP_FILE",   UDM_PARAM_STOPFILE,CONST_CS | CONST_PERSISTENT);        
        
        /* udm_add_search_limit constants */
        REGISTER_LONG_CONSTANT("UDM_LIMIT_CAT",         UDM_LIMIT_CAT,CONST_CS | CONST_PERSISTENT);
@@ -163,6 +164,9 @@ DLEXPORT PHP_MINIT_FUNCTION(mnogosearch)
        REGISTER_LONG_CONSTANT("UDM_PARAM_FOUND",       UDM_PARAM_FOUND,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_PARAM_NUM_ROWS",    UDM_PARAM_NUM_ROWS,CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("UDM_PARAM_WORDINFO",    UDM_PARAM_WORDINFO,CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("UDM_PARAM_WORD_INFO",   UDM_PARAM_WORDINFO,CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("UDM_PARAM_SEARCHTIME",  UDM_PARAM_SEARCHTIME,CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("UDM_PARAM_SEARCH_TIME", UDM_PARAM_SEARCHTIME,CONST_CS | CONST_PERSISTENT);
 
        /* search modes */
        REGISTER_LONG_CONSTANT("UDM_MODE_ALL",          UDM_MODE_ALL,CONST_CS | CONST_PERSISTENT);
@@ -550,7 +554,6 @@ DLEXPORT PHP_FUNCTION(udm_get_res_field){
                                break;
                                
                        case UDM_FIELD_DESC:            
-                       case UDM_FIELD_DESCRIPTION:             
                                RETURN_STRING((Res->Doc[row].description),1);
                                break;
                                
@@ -566,7 +569,6 @@ DLEXPORT PHP_FUNCTION(udm_get_res_field){
                                RETURN_LONG((Res->Doc[row].url_id));
                                break;
                                
-                       case UDM_FIELD_SCORE:           
                        case UDM_FIELD_RATING:          
                                RETURN_LONG((Res->Doc[row].rating));
                                break;
@@ -629,6 +631,10 @@ DLEXPORT PHP_FUNCTION(udm_get_res_param)
                case UDM_PARAM_WORDINFO:        
                        RETURN_STRING(Res->wordinfo,1);
                        break;
+                       
+               case UDM_PARAM_SEARCHTIME:      
+                       RETURN_DOUBLE(((double)Res->work_time)/1000);
+                       break;                  
 
                default:
                        php_error(E_WARNING,"Udm_Get_Res_Param: Unknown mnoGoSearch param name");

diff --git a/ext/mnogosearch/test.php b/ext/mnogosearch/test.php
index bfc152615218ccc10ad0f25f004e7a5b29a8b9b6..b44c9103c9be85863ad8c5d79177bb7efa6fbd85 100644 (file)
--- a/ext/mnogosearch/test.php
+++ b/ext/mnogosearch/test.php
@@ -63,6 +63,9 @@
                $total=Udm_Get_Res_Param($res,UDM_PARAM_FOUND);
                $rows=Udm_Get_Res_Param($res,UDM_PARAM_NUM_ROWS);
                $wordinfo=Udm_Get_Res_Param($res,UDM_PARAM_WORDINFO);
+               $searchtime=Udm_Get_Res_Param($res,UDM_PARAM_SEARCHTIME);
+
+               printf("Searchtime: ".$searchtime."\n\n");
 
                printf("Documents %d-%d from %d total found; %s\n\n",
                        $first,$first+$rows-1,$total,$wordinfo);
@@ -79,7 +82,7 @@
                        printf("     SIZE : %d\n",Udm_Get_Res_Field($res,$i,UDM_FIELD_SIZE));
                        printf("     MODIFIED : %s\n",Udm_Get_Res_Field($res,$i,UDM_FIELD_MODIFIED));
                        printf("     URLID : %d\n",Udm_Get_Res_Field($res,$i,UDM_FIELD_URLID));
-                       printf("     SCORE : %d\n",Udm_Get_Res_Field($res,$i,UDM_FIELD_SCORE));
+                       printf("     RATING : %d\n",Udm_Get_Res_Field($res,$i,UDM_FIELD_RATING));
                        printf("     CRC : %d\n",Udm_Get_Res_Field($res,$i,UDM_FIELD_CRC));
                        printf("---------\n");
                }