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

Timestamp:

01/19/10 17:02:39 (14 years ago)

Author:

eduardoalex

Message:

Ticket #841 - Resolvendo o problema descrito no ticket em questao

File:

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

trunk/expressoMail1_2/js/local_messages.js

@@ -161 +161 @@
                 ' (id_folder text,folder_name text,uid_usuario int)');
                 this.dbGears.execute('create table if not exists msgs_to_remove (id_msg int,folder text,uid_usuario int)');
+                this.dbGears.execute('create index if not exists idx_user3 on mail (id_folder,uid_usuario,timestamp)');
 
                 //some people that used old version of local messages could not have the size column. If it's the first version
@@ -415 +416 @@
                         filter = "and header like '%\"Answered\";s:1:\"A%' ";
                 }
-                sql = 'select rowid,header,size,timestamp,unseen,body from (';
-                sql += 'select mail.rowid as rowid,mail.header as header,mail.size as size,mail.timestamp as timestamp,mail.unseen as unseen,mail.body as body,ltrim(ltrim(substr(UPPER(ffrom),21,length(ffrom)),\':\'),\'"\') as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and lower(mail.ffrom) not like lower(?) ';
-                sql += filter;
-                sql += 'union ';
-                sql += 'select mail.rowid as rowid,mail.header as header,mail.size as size,mail.timestamp as timestamp,mail.unseen as unseen,mail.body as body,ltrim(ltrim(substr(UPPER(fto),7,length(fto)),\':\'),\'"\') as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and lower(mail.ffrom) like lower(?) ';
-                sql += filter;
-                sql += ') order by '
+                
+                sql = 'select mail.rowid as rowid,mail.header as header,mail.size as size,mail.timestamp as timestamp,mail.unseen as unseen,mail.body as body,case when lower(mail.ffrom) like ? then ltrim(ltrim(substr(UPPER(ffrom),21,length(ffrom)),\':\'),\'"\') else ltrim(ltrim(substr(UPPER(fto),7,length(fto)),\':\'),\'"\') end as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? order by '
                 
                 if(sort == 'SORTFROM') {
@@ -441 +437 @@
 
 
-                var rs = this.dbGears.execute(sql,[account_id,folder,'%'+Element("user_email").value+'%',account_id,folder,'%'+Element("user_email").value+'%',msg_range_begin,emails_per_page]);
+                var rs = this.dbGears.execute(sql,['%'+Element("user_email").value+'%',account_id,folder,msg_range_begin,emails_per_page]);
                 var cont = 0;
                 
@@ -662 +658 @@
                 this.init_local_messages();
                 var retorno = new Array();
-                rs = this.dbGears.execute("select folder.folder,sum(mail.unseen) from folder left join mail on "+
-                                "folder.rowid=mail.id_folder where folder.uid_usuario=? group by folder.folder",[account_id]);
+                rs = this.dbGears.execute("select folder,rowid from folder where uid_usuario=?",[account_id]);
                 while(rs.isValidRow()) {
                         var temp = new Array();
                         temp[0] = rs.field(0);
-                        temp[1] = rs.field(1);
-                        var rs2 = this.dbGears.execute("select * from folder where folder like ?",["%"+temp[0]+"/%"]);
-                        if(rs2.isValidRow())
+                        
+                        var rs2 = this.dbGears.execute("select count(*) from mail where id_folder=? and unseen=1",[rs.field(1)]);
+                        temp[1] = rs2.field(0);                 
+
+                        var rs3 = this.dbGears.execute("select * from folder where folder like ? limit 1",[temp[0]+"/%"]);
+                        if(rs3.isValidRow())
                                 temp[2] = 1;
                         else