Changeset 1614 for trunk/expressoMail1_2/js/search.js

Timestamp:

11/10/09 16:01:36 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #720 - Na pesquisa de e-mails mostra resultados até limite quando ultrapassa.

File:

• trunk/expressoMail1_2/js/search.js (modified) (3 diffs)

trunk/expressoMail1_2/js/search.js

@@ -292 +292 @@
                         }
                 }
-                if(nw_array.length > 0 && showMsg)
-                        write_msg(nw_array.length + " "+ get_lang('results found'));
+
+                if( (preferences.search_result_number != '65536') && (nw_array.length > 0) && (nw_array.length >= preferences.search_result_number) ){
+                    nw_array.length = preferences.search_result_number;
+                    write_msg(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number));
+                }
+                else {
+                        write_msg(nw_array.length + " "+ get_lang('results found'));
+                }
+
                 numBox++;
                 var border_id = create_border(get_lang("Search Results"), "search_" + numBox);
@@ -781 +788 @@
                         var tmp;
                         var countTmp= new Array();
+
+                        var dataTemp = data.split('=sumResults=');
+                        var sumResults = dataTemp[0];
+
+                        var data = dataTemp[1] ? dataTemp[1] : dataTemp[0];
+
                         if (local_folders.length > 0) {
                                 tmp = expresso_local_messages.search(local_folders, fields);
@@ -788 +801 @@
                                 }
                         }
-                        if((data == "none") && (countTmp.length==0)){alert(get_lang("None result was found."));}
-                        if (preferences.search_result_number == '65536' || (data != 'many results' && countTmp.length < preferences.search_result_number))
+//                      if((data == "none") && (countTmp.length==0)){alert(get_lang("None result was found."));}
+//                      if (preferences.search_result_number == '65536' || (data != 'many results' && countTmp.length < preferences.search_result_number))
+//                        {
+//                            EsearchE.mount_result((data=='none')?tmp:(countTmp.length==0)?data:data+tmp);
+//                        }
+//                        else if (data == 'many results' || countTmp.length >= preferences.search_result_number)
+//                        {
+//                            alert(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number));
+//                        }
+
+                        if ((sumResults == "none") && (countTmp.length==0)){
+                            alert(get_lang("None result was found."));
+                        }
+                        else
                         {
-                            EsearchE.mount_result((data=='none')?tmp:(countTmp.length==0)?data:data+tmp);
+                            EsearchE.mount_result((sumResults=='none')?tmp:(countTmp.length==0)?data:data+tmp);
                         }
-                        else if (data == 'many results' || countTmp.length >= preferences.search_result_number)
-                        {
-                            alert(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number));
-                        }
+
                 }
                 var args   = "$this.imap_functions.search_msg";