// initialize it with known data..
// that should wipe out dupes.
- var matches = this.execute("SELECT count(id) FROM Attachment WHERE id = %d".printf(
+ var matches = this.execute("SELECT count(id) as nid FROM Attachment WHERE id = %d".printf(
int.parse(sid)));
- GLib.error("Got Matches :%s", matches);
+
- if (matches=="0") {
- GLib.error("Failed to find id :%s", sid);
- return;
+ if (matches == "") {
+ // our old mailfort code deleted the crap out of old records...
+ // if this occurs we will need to create the record again..
+ this.fix_deleted_attachment_db(int.parse(sid),attachment);
+ return;
+
}
int.parse(sid)));
if (filesize=="") {
- GLib.debug("Ignoring record id (missing in database) :%s", sid);
+ GLib.error("Ignoring record id (missing in database) :%s", sid);
return;
}
if (int.parse(filesize) < 1) {
}
+ public void fix_deleted_attachment_db(int id, GMime.Part attachment)
+ {
+
+ var filename = attachment.get_header("X-strip-content-name");
+ var file_path = attachment.get_header("X-strip-path");
+ var fn = StripApplication.opt_target_path + "/" + file_path;
+ var chksum = this.md5_file(fn);
+ var mime_type = attachment.get_header("X-strip-content-type");
+
+ var fileinfo = File.new_for_path(fn)
+ .query_info(GLib.FileAttribute.STANDARD_SIZE+","+GLib.FileAttribute.TIME_MODIFIED
+ ,GLib.FileQueryInfoFlags.NONE,null);
+ var file_size = (int) fileinfo.get_size();
+
+
+
+
+ this.query("""
+
+
+ INSERT INTO Attachment (
+ id,
+
+ msgid ,
+ queue_id ,
+ mime_filename ,
+ mime_type,
+
+ stored_filename ,
+ mime_charset ,
+ mime_cdisp ,
+ mime_is_cover ,
+
+ mime_is_multi ,
+ mime_is_mail,
+ mime_size ,
+ filesize,
+
+ checksum
+
+ ) 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
+
+ )"
+
+
+ """.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 is done to fix the queue_id or maillog_id ??
+ this.query("""
+ SELECT attachment_update(
+ %d, -- in_id INT(11),
+
+ '%s', -- in_created DATETIME,
+ '%s' -- in_mailfort_sig varchar(64)
+ )
+ """.printf(
+ id,
+ "", // this will be ignored..
+ this.created_date,
+ this.mysql_escape(this.active_message_x_mailfort_sig)
+
+ )
+ );
+ GLib.error("added attachment?");
+ }
+
+
public void replace_attachment(GMime.Multipart parent, GMime.Part attachment)
{
var sid = attachment.get_header("X-strip-id");
- var rc= this.mysql.query(str);
+ var rc= this.mysql.query(str);
if ( rc != 0 ) {
GLib.debug("ERROR %u: Query failed: %s\n", this.mysql.errno(), this.mysql.error());
var rs = mysql.use_result();
+ //GLib.debug("got %d rows", (int) rs.num_rows());
+
var got_row = false;
string[] row;
string ret = "";
}
if (!need_return) {
+ if (StripApplication.opt_debug_sql) {
+ GLib.debug("got %s", got_row ? "=Nothing=" : ret);
+ }
return got_row ? "" : ret;
}
if (!got_row) {
+
GLib.debug("ERROR : no rows returned");
Posix.exit(1);
return "";
}
- GLib.debug("got %s", ret);
+ if (StripApplication.opt_debug_sql) {
+ GLib.debug("got %s", ret);
+ }
return ret;