add logging and sender address

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

diff --git a/procmail/msgid-index b/procmail/msgid-index
index 102dacc0f9fb7f1b222ca8c58f9861f6c3d895f3..caccf830e28f34e44c1788b40339d06485e9c369 100644 (file)
--- a/procmail/msgid-index
+++ b/procmail/msgid-index
@@ -14,10 +14,9 @@ DATA="$FROM,$NL$ORIGINAL_TO,$NL$SUBJECT,$NL$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 
 QUERY="insert into messages (sender, recipient, subject, msgid, filename, dest) values (
 INCLUDERC=$PMDIR/sql-escape
 
 QUERY="insert into messages (sender, recipient, subject, msgid, filename, dest) values (

-  $DATA, '\\'$THISLOGFILE_REL\\'', '\\'\$DESTFILE\\'');
-       select * from messages where filename = '\\'$THISLOGFILE_REL\\''"
-TRAP="$TRAP; case \"$($DO_QUERY '$QUERY')\" in '') 
-      echo 'msgid-index: failed to insert reference into database';; esac"
+  $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