Changeset 1622 for trunk/expressoMail1_2/js/local_messages.js

Timestamp:

11/11/09 17:13:52 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #722 - Implementação da pesquisa avançada no expressoMail.

File:

• trunk/expressoMail1_2/js/local_messages.js (modified) (8 diffs)

trunk/expressoMail1_2/js/local_messages.js

@@ -9 +9 @@
                 this.fileSubmitter = null;
         }
+
+        function HeaderFlags()
+        {
+            this.Answered = 0;
+            //this.Draft = 0;
+            this.Flagged = 0;
+            this.Recent = 0;
+        }
+
+        HeaderFlags.prototype.getAnswered = function()
+        {
+            return this.Answered;
+        }
+
+        HeaderFlags.prototype.setAnswered = function(answered)
+        {
+            this.Answered = answered;
+        }
+
+        //HeaderFlags.prototype.getDraft = function()
+        //{
+        //    return this.Draft;
+        //}
+
+        HeaderFlags.prototype.setDraft = function(draft)
+        {
+            this.Draft = draft;
+        }
+
+        HeaderFlags.prototype.getFlagged = function()
+        {
+            return this.Flagged;
+        }
+
+        HeaderFlags.prototype.setFlagged = function(flagged)
+        {
+            this.Flagged = flagged;
+        }
+
+        HeaderFlags.prototype.getRecent = function()
+        {
+            return this.Recent;
+        }
+
+        HeaderFlags.prototype.setRecent = function(recent)
+        {
+            this.Recent = recent;
+        }
+
+        function FlagsParser(headerObj)
+        {
+            this.Header = headerObj;
+        }
+
+        FlagsParser.prototype.parse = function()
+        {
+            var tmp = null;
+            if (typeof this.Header == 'string')
+            {
+                tmp = connector.unserialize(this.Header);
+            }
+            else
+            {
+                tmp = this.Header;
+            }
+
+            flags = new HeaderFlags();
+
+            if (tmp.Answered && tmp.Answered.match(/^A$/))
+            {
+                flags.setAnswered(1);
+                //if (tmp.Draft && tmp.Draft.match(/^X$/))
+                //{
+                //    flags.setDraft(1);
+                //}
+            }
+
+            if (tmp.Flagged && tmp.Flagged.match(/^F$/)){
+                flags.setFlagged(1);
+            }
+
+            if (tmp.Forwarded && tmp.Forwarded.match(/^F$/)){
+                flags.setAnswered(1);
+                //flags.setDraft(1);
+            }
+
+            if (tmp.Recent && tmp.Recent.match(/^R$/)){
+                flags.setRecent(1);
+            }
+
+            return flags;
+
+        }
+        
         local_messages.prototype.installGears = function (){
                 temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to install it now?"));
@@ -83 +177 @@
                 }
                 //end of temporary code
+
+                try {
+                    this.dbGears.execute('begin transaction');
+                    this.dbGears.execute('alter table mail add column answered int');
+                    //this.dbGears.execute('alter table mail add column draft int');
+                    this.dbGears.execute('alter table mail add column flagged int');
+                    this.dbGears.execute('alter table mail add column recent int');
+                    //this.dbGears.execute('commit transaction');
+                    //transaction_ended = true;
+                    //if (transaction_ended){
+                    rs = null;
+                    rs = this.dbGears.execute('select rowid,header from mail');
+
+                    // Popular os valores das novas colunas.
+                    var tmp = null;
+                    //this.dbGears.execute('begin transaction');
+                    while(rs.isValidRow()) {
+                        //tmp = connector.unserialize(rs.field(1));
+                        parser = new FlagsParser(rs.field(1));
+                        flags = parser.parse();
+
+                        this.dbGears.execute('update mail set answered='+flags.getAnswered()+
+                            ',flagged='+flags.getFlagged()+',recent='+flags.getRecent()+
+                            //',draft='+flags.getDraft()+' where rowid='+rs.field(0));
+                            ' where rowid='+rs.field(0));
+
+                        rs.next();
+                    }
+                    this.dbGears.execute('commit transaction');
+
+                    //tmp = null;
+
+                }catch(Exception) {
+                    this.dbGears.execute('rollback transaction');
+                }
+
         }
         
@@ -156 +286 @@
                         if(msg_info.Unseen=="U")
                                 unseen = 1;
-            this.dbGears.execute("insert into mail (mail,original_id,original_folder,header,timestamp,uid_usuario,unseen,id_folder,ffrom,subject,fto,cc,body,size) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",[mail,original_id,original_folder,header,timestamp,login,unseen,id_folder,from,subject,to,cc,body,size]);
+
+                        //parse header
+                        parser = new FlagsParser(msg_header);
+                        flags = parser.parse();
+
+                        //insere o e-mail
+                        //this.dbGears.execute("insert into mail (mail,original_id,original_folder,header,timestamp,uid_usuario,unseen,id_folder,ffrom,subject,fto,cc,body,size) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",[mail,original_id,original_folder,header,timestamp,login,unseen,id_folder,from,subject,to,cc,body,size]);
+                        this.dbGears.execute("insert into mail (mail,original_id,original_folder,header,timestamp,uid_usuario,unseen,id_folder,ffrom,subject,fto,cc,body,size,answered,flagged,recent) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",[mail,original_id,original_folder,header,timestamp,login,unseen,id_folder,from,subject,to,cc,body,size,flags.getAnswered(),flags.getFlagged(),flags.getRecent()]);
                         var call_back = function() {
                         }
@@ -571 +708 @@
         }
         
-        local_messages.prototype.search = function(folders,filter) {
-                this.init_local_messages();
-                var filters = filter.replace(/##/g," ");
-                filters = filters.replace(/^ +| +$/g,"");
-                filters = filters.split("<=>");
+        local_messages.prototype.search = function(folders,sFilter) {
+                this.init_local_messages();
+                var filters = sFilter.replace(/^##|##$/g,"").split('##');
                 var friendly_filters = new Array();
-                if (filters[0].indexOf('ALL') != -1) { //all filters...
-                        friendly_filters.push("SUBJECT");
-                        friendly_filters.push(filters[1]);
-                        friendly_filters.push("BODY");
-                        friendly_filters.push(filters[1]);
-                        friendly_filters.push("FROM");
-                        friendly_filters.push(filters[1]);
-                        friendly_filters.push("TO");
-                        friendly_filters.push(filters[1]);
-                        friendly_filters.push("CC");
-                        friendly_filters.push(filters[1]);                      
+
+                if (sFilter.indexOf('ALL') != -1) { //all filters...
+                    filters[0] = sFilter.replace(/##/g,"");
+                    tmp = filters[0].split("<=>");
+
+                    searchKey = new Array();
+                    searchKey.push("SUBJECT");
+                    searchKey.push(tmp[1]);
+                    friendly_filters.push(searchKey);
+
+                    searchKey = new Array();
+                    searchKey.push("BODY");
+                    searchKey.push(tmp[1]);
+                    friendly_filters.push(searchKey);
+
+                    searchKey = new Array();
+                    searchKey.push("FROM");
+                    searchKey.push(tmp[1]);
+                    friendly_filters.push(searchKey);
+
+                    searchKey = new Array();
+                    searchKey.push("TO");
+                    searchKey.push(tmp[1]);
+                    friendly_filters.push(searchKey);
+
+                    searchKey = new Array();
+                    searchKey.push("CC");
+                    searchKey.push(tmp[1]);
+                    friendly_filters.push(searchKey);
                 }
                 else {
-                        friendly_filters[0] = filters[0];
-                        for (var i in filters) {
-                                if (i != 0) {
-                                        var temp = filters[i].split(" ");
-                                        friendly_filters.push(temp[0]);
-                                        friendly_filters.push(temp[1]);
-                                }
-                        }
+                    for (var i=0; i<filters.length; i++)
+                    {
+                        if (filters[i] != ""){
+                            //tmp[0] = tmp[0].replace(/^\s+|\s+$/g,"");
+                            //tmp[1] = tmp[1].replace(/^\s+|\s+$/g,"");
+                            friendly_filters.push(filters[i].split("<=>"));
+                        }
+                    }
                 }
                 var sql = "select mail.header,folder.folder,mail.rowid,size from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario="+account_id + " and folder.folder in (";
@@ -607 +760 @@
                 sql += ") and (";
                 for (var z=0;z<friendly_filters.length-1;z++) {
-                        if(z%2==0) {
-                                if (z != 0) {
-                                        if (filters[0].indexOf('ALL') != -1) 
-                                                sql += " or";
-                                        else 
-                                                sql += " and";
-                                }
-                                sql+=" mail."+this.aux_convert_filter_field(friendly_filters[z])+" like '%"+url_decode(friendly_filters[z+1])+"%'";
-                        }
+                    if (z != 0) {
+                        if (sFilter.indexOf('ALL') != -1)
+                            sql += " or";
+                        else
+                            sql += " and";
+                    }
+                    var cond = friendly_filters[z][0].replace(/^\s+|\s+$/g,"");
+                    if (cond == "SINCE" || cond == "BEFORE" | cond == "ON"){
+
+                        tmpDate = url_decode(friendly_filters[z][1]).split('/');
+
+                        // Date = url_decode(friendly_filters[z][1]);
+                        sql+=" mail.timestamp " + this.aux_convert_filter_field(friendly_filters[z][0], tmpDate);
+                    }
+                    else if (!friendly_filters[z][1])
+                        {
+                            sql+=" mail."+this.aux_convert_filter_field(friendly_filters[z][0]);
+                        }
+                        else
+                            {
+                                sql+=" mail."+this.aux_convert_filter_field(friendly_filters[z][0])+" like '%"+url_decode(friendly_filters[z][1])+"%'";
+                            }
                 }
                 sql += ")";
@@ -621 +787 @@
                 var retorno = "";
                 while(rs.isValidRow()) {
-                        var header = connector.unserialize(rs.field(0));
-                        retorno+="##"+"local_"+rs.field(1)+"--"+header["from"]["name"]+"--"+header["subject"]+"--"+header["udate"]+"--"+this.aux_convert_size(rs.field(3))+"--"+header["Unseen"]+header["Recent"]+header["Flagged"]+header["Draft"]+"--"+rs.field(2)+"##";
-                        rs.next();
+                    var header = connector.unserialize(rs.field(0));
+                    retorno+="##"+"local_"+rs.field(1)+"--"+"local_"+rs.field(1)+"--"+header["from"]["name"]+"--"+header["subject"]+"--"+header["udate"]+"--"+this.aux_convert_size(rs.field(3))+"--"+header["Unseen"]+header["Recent"]+header["Flagged"]+header["Draft"]+"--"+rs.field(2)+"##";
+                    rs.next();
                 }
 
@@ -641 +807 @@
         }
         
-        local_messages.prototype.aux_convert_filter_field = function(filter) {
+        local_messages.prototype.aux_convert_filter_field = function(filter,date) {
+                if (typeof date != 'undefined'){
+                    var dateObj=new Date();
+                    dateObj.setFullYear(date[2],date[1]-1,date[0]);
+                }
+
                 if((filter=="SUBJECT ") || (filter=="SUBJECT"))
                         return "subject";
@@ -652 +823 @@
                 else if((filter=="CC ") || (filter=="CC"))
                         return "cc";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "SINCE"){
+                        dateObj.setHours(0, 0, 0, 0);
+                        return ">= " + dateObj.getTime().toString(10).substr(0, 10);
+                }
+                else if (filter.replace(/^\s+|\s+$/g,"") == "BEFORE"){
+                        dateObj.setHours(23, 59, 59, 999);
+                        return "<= " + dateObj.getTime().toString(10).substr(0, 10);
+                }
+                else if (filter.replace(/^\s+|\s+$/g,"") == "ON"){
+                        dateObj.setHours(0, 0, 0, 0);
+                        var ts1 = dateObj.getTime().toString(10).substr(0, 10);
+                        dateObj.setHours(23, 59, 59, 999);
+                        var ts2 = dateObj.getTime().toString(10).substr(0, 10);
+                        return ">= " + ts1 + ") and (timestamp <= " + ts2;
+                }
+                else if (filter.replace(/^\s+|\s+$/g,"") == "FLAGGED")
+                        return "flagged = 1";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "UNFLAGGED")
+                        return "flagged = 0";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "UNSEEN")
+                        return "unseen = 1";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "SEEN")
+                        return "unseen = 0";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "ANSWERED")
+                        return "answered = 1";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "UNANSWERED")
+                        return "answered = 0";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "RECENT")
+                        return "recent = 1";
+                else if (filter.replace(/^\s+|\s+$/g,"") == "OLD")
+                        return "recent = 0";
+
         }