Changeset 2402

Timestamp:

04/01/10 14:57:26 (14 years ago)

Author:

amuller

Message:

Ticket #1022 - Mudando critérios de req. ao entrar na cache/

Location:

trunk

Files:

• expressoMail1_2/js/TreeShow.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (2 diffs)
• expressoMail1_2/js/main.js (modified) (3 diffs)
• expressoMail1_2/js/messages_controller.js (modified) (2 diffs)
• phpgwapi/js/expressoAjax/expressoAjax.js (modified) (3 diffs)

trunk/expressoMail1_2/js/TreeShow.js

@@ -34 +34 @@
                 }
                 if(!expresso_offline)
+                {
+                        expresso.connector.cacheNextRequest(1);
                         cExecute ("$this.imap_functions.get_folders_list&folder="+current_folder, handler_update_folders);              
+                }
                 else
                         handler_update_folders('');

trunk/expressoMail1_2/js/draw_api.js

@@ -115 +115 @@
                                 }
                         }
-                        cExecute ("$this.imap_functions.get_folders_list&folder="+current_folder, update_tree_folders);
+                        expresso.connector.cacheNextRequest(1);
+                        cExecute ("$this.imap_functions.get_folders_list&folder=INBOX", update_tree_folders);
                 }
         
@@ -796 +797 @@
         }
         else if(msg_folder && msg_number){
+                expresso.connector.cacheNextRequest();
                 cExecute("$this.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), show_msg);
                 Element('msg_folder').value = '';

trunk/expressoMail1_2/js/main.js

@@ -513 +513 @@
                                 if (msg_to_delete.previousSibling){
                         var previous_msg = msg_to_delete.previousSibling.id;
+                        expresso.connector.cacheNextRequest();
                         cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(current_folder), show_msg);
                     }               
@@ -668 +669 @@
                                         var previous_msg = msg_to_delete.previousSibling.id;
                                         //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg);
+                                        expresso.connector.cacheNextRequest();
                                         cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg);
                                 }
@@ -1687 +1689 @@
 
         var openNewMessage = function () {
+                expresso.connector.cacheNextRequest();
                 cExecute("$this.imap_functions.get_info_msg&msg_number="+newUid
                                 +"&msg_folder="+url_encode(current_folder),show_msg);

trunk/expressoMail1_2/js/messages_controller.js

@@ -28 +28 @@
                         eval("call_back(data)");
                 }else {
+                        expresso.connector.cacheNextRequest();
                         cExecute("$this.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), call_back);
                 }
@@ -286 +287 @@
      }
      else
+     {
+        expresso.connector.cacheNextRequest();
         cExecute('$this.imap_functions.get_info_msg&msg_number='+msgs_number+'&msg_folder='+url_encode(folder_name),call_back);
+     }
     }
 

trunk/phpgwapi/js/expressoAjax/expressoAjax.js

@@ -42 +42 @@
                 this.oldY = 0;
                 this.updateVersion = "";
+                this.cacheRequest = null;
                 this.connectorCache = {
                                 'valid' : [],
@@ -516 +517 @@
                 }
         }
+        cConnector.prototype.cacheNextRequest = function(expiration){
+                if (typeof(expiration) == 'undefined')
+                        expiration=0;
+                this.cacheRequest=expiration;
+        }
+
         cConnector.prototype.addToCache = function(id,data){
                 if (typeof(preferences) == "undefined" || preferences.use_cache != 'True')
@@ -522 +529 @@
                 if (func.indexOf('&') > 0)
                         func = func.substr(0,func.indexOf('&'));
-                switch (func){
-                        // functions that enters in cache
-                        case 'get_info_msg':
+                switch (this.cacheRequest){
+                        // functions that enters in cache and never expires
+                        case 0:
                                 data.cacheHit = true;
-                        case 'get_preferences':
-                        case 'getSharedUsersFrom':
-                        case 'get_organizations':
-                        case 'get_catalogs':
-                        case 'get_dropdown_contacts':
-                        case 'get_cc_contacts':
-                        case 'get_cc_groups':
-                        case 'getUsersByEmail':
                                 this.connectorCache.valid[id] = true;
                                 this.connectorCache.result[id] = data;
                                 break;
+                        case 1:
                         // function that needs expire
-                        case 'get_range_msgs2':
-                        case 'quicksearch':
-                        case 'get_folders_list':
-                        case 'search_msg':
-                        case 'search_for':
                                 this.connectorCache.valid[id] = true;
-                                this.connectorCache.result[id] = data;
+                                this.connectorCache.result[id] = data;
                                 var i = this.expurgatedCache.length;
                                 this.expurgatedCache[i+1] = id;
                                 break;
+                        case 2:
                         //functions that expires the cache
-                        case 'move_messages':
-                        case 'delete_msgs':
-                        case 'getReturnExecuteForm':
-                        case 'set_messages_flag':
-                        case 'empty_trash':
                                 this.purgeCache();
-                        default: // no cache
+                        default:
+                        // no cache
                                 break;
                 }