undelay on senders, not from

[etc/mailfilter.git] / procmail / msgid-index

diff --git a/procmail/msgid-index b/procmail/msgid-index
index c85b61ae3160cfe1ca9903a1f4c42b6a7e40773b..caccf830e28f34e44c1788b40339d06485e9c369 100644 (file)
--- a/procmail/msgid-index
+++ b/procmail/msgid-index
@@ -1,9 +1,9 @@
-# create table logfiles (sender text not null, recipient text not null,
-# subject text not null, msgid text unique not null, filename text primary key
-# not null unique, timestamp timestamp with time zone, dest text not null);
+# create table messages (sender text not null, recipient text not null,
+# subject text not null, msgid text not null, filename text primary key
+# not null unique, timestamp integer, dest text not null);

 #
 #

-# create trigger insert_logfiles_timestamp after insert on logfiles begin
-# update logfiles set timestamp = datetime('now') where filename
+# create trigger insert_messages_timestamp after insert on messages begin
+# update messages set timestamp = strftime('%s', 'now') where filename

 # = new.filename; end;
 
 MSGID_INDEX_DB=$PMVAR/msgid-index.sqlite
 # = new.filename; end;
 
 MSGID_INDEX_DB=$PMVAR/msgid-index.sqlite


@@ -13,9 +13,10 @@ DO_QUERY="$SQLITE $MSGID_INDEX_DB"
 DATA="$FROM,$NL$ORIGINAL_TO,$NL$SUBJECT,$NL$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 
 DATA="$FROM,$NL$ORIGINAL_TO,$NL$SUBJECT,$NL$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 

-QUERY="insert into logfiles (sender, recipient, subject, msgid, filename, dest) values (
-  $DATA, '\\'$THISLOGFILE_REL\\'', '\\'\$DEST\\'')"
-TRAP="$TRAP; $DO_QUERY '$QUERY'"
+QUERY="insert into messages (sender, recipient, subject, msgid, filename, dest) values (
+  $DATA, '$THISLOGFILE_REL', '\$DESTFILE');"
+TRAP="$TRAP; OUT=\"$(echo \"$QUERY\" | $DO_QUERY 2>&1)\";
+      [ -n \"\$OUT\" ] && echo \"msgid-index: failed to insert reference into database: \$OUT\""

 
 QUERY
 DATA
 
 QUERY
 DATA