src/strip.vala

[app.mailtrimmer] / src / strip.vala

diff --git a/src/strip.vala b/src/strip.vala
index e05a408..4223b03 100644 (file)
--- a/src/strip.vala
+++ b/src/strip.vala
@@ -370,7 +370,7 @@ public class Strip : GLib.Object {
        
        // initialize it with known data..
        // that should wipe out dupes.
-       var matches = this.execute("SELECT count(id) as nid FROM Attachment WHERE id = %d".printf(
+       var matches = this.execute("SELECT id   FROM Attachment WHERE id = %d".printf(
                        int.parse(sid)));  
 
                 
@@ -455,7 +455,7 @@ public class Strip : GLib.Object {
                
 
       
-               this.query("""
+               this.execute("""
                       
                       
                                INSERT INTO Attachment  (  
@@ -476,56 +476,52 @@ public class Strip : GLib.Object {
                                    mime_size ,
                                    filesize,
                                    
-                                   checksum
+                                   checksum,
+                                   created
 
                                ) VALUES (
                                        %d,  -- id
+                                       
                                    '%s' , -- msgid
                                    0,
                                    '%s'  , -- filename
-                                   '', 
-                                   '',
-                                   '',
+                                   '%s',  -- mimetype
+                                   
+                                   '%s', -- stored file anme
+                                   '', -- charset
                                    'attachment',
                                    0,
                                    0,
                                    0,
                                    %d, -- size
                                    %d, -- size
-                                   '%s' -- checkum
-
-                               )"
+                                   
+                                   '%s', -- checkum
+                                       '%s' -- created:
+                               )
                       
                       
-                        INSERT INTO Attachment (
-                               id, msgid, checksum, mime_type,
-                               mime_filename,  filesize,mime_size,  mime_cdisp
-                               ) values (
-                               ( 
-                            %d,   '%s', '%s',  '%s',
-                            '%s'  %d, %d, 'attachment', 
-                            
-                            ) 
-                            
                      """.printf(
                                id,
                                      this.mysql_escape(this.active_message_exim_id),
+                                     this.mysql_escape(filename),
+                                 this.mysql_escape(mime_type),
+                                 this.mysql_escape(file_path),
+                                       file_size,
+                                     file_size,
                                      this.mysql_escape(chksum),
-                                 this.mysql_escape(mime_type),                                                       
-                                     this.mysql_escape(filename),                        
-                                     file_size
+                                       this.created_date
                         ));
-                        
+             // this is done to fix the queue_id or maillog_id ??
                 this.query("""
                  SELECT attachment_update(
                       %d, -- in_id INT(11),
-                      '%s', -- in_mime_type varchar(255),
+                                               '', -- mime type
                       '%s', -- in_created DATETIME,
                       '%s' -- in_mailfort_sig varchar(64)
                  )
              """.printf(
-                               id,
-                       "", // this will be ignored..
+                               id, 
                                this.created_date,
                                this.mysql_escape(this.active_message_x_mailfort_sig)
              
@@ -695,7 +691,13 @@ public class Strip : GLib.Object {
     {
            return this.real_query(false, str);
     }
-    public string real_query(bool need_return, string str)
+    /**
+    * need_return 
+    0 = no
+    1 = yes
+    -1 = don't try.
+    */
+    public string real_query(int need_return, string str)
     {
                GLib.debug("Before Query : %u  : %s\n", this.mysql.errno(), this.mysql.error());