Follow up to 87602f54.

Fix minor bugs.  Update the testsuite.  All tests pass now.

* modules/mailutils/mod_mailutils.c (cb_statistics): Remove. Use
wy_cb_statistics.
(expand_email_admin, expand_email_owner): Add missing functions.
* src/config.c (wy_cb_statistics): New function.
(wydawca_kw): Restore "statistics" statement.
* src/dictionary.c (dictionary_lookup): Fix debug levels.
* src/wydawca.h (wy_cb_statistics): New proto.
* tests/atlocal.in (wydawca_expandmeta): Expand @WD_MODDIR@
* tests/check-notify.at: Create notify.rc from notify.rcin
* tests/notify-upl.at: Likewise.
* tests/mailstats.at: Likewise.
* tests/upload-dry.at: Fix the expected output.

* tests/etc/mailstats.rc: Rename to tests/etc/mailstats.rcin.
* tests/etc/notify.rc: Rename to tests/etc/notify.rcin.
* tests/etc/Makefile.am: Update.
* tests/etc/wydawca.rcin: Update to the new syntax.

1 files changed, 56 insertions, 0 deletions

diff --git a/tests/etc/mailstats.rcin b/tests/etc/mailstats.rcin
new file mode 100644
index 0000000..b3aeab7
--- /dev/null
+++ b/tests/etc/mailstats.rcin
@@ -0,0 +1,56 @@
+# This file is part of Wydawca testsuite
+# Copyright (C) 2009-2011 Sergey Poznyakoff
+#
+# Wydawca is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Wydawca is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Wydawca.  If not, see <http://www.gnu.org/licenses/>.
+
+module-prepend-load-path "@WD_MODDIR@";
+module mailutils mod_mailutils.la;
+module-init mailutils {
+	admin-address "root@localhost";
+	from-address "wydawca-noreply@localhost";
+
+	mailer "| @WD_CONFSRC@/nullmail @WD_DST@/mail.out -F ${sender} ${rcpt}";
+	
+	mail-statistics {
+		statistics all;
+		message <<EOT
+Subject: Wydawca stats
+
+This is to notify you that the recent run of wydawca
+caused the following results:
+
+errors ............................. ${stat:errors}
+warning ............................ ${stat:warnings}
+bad signatures ..................... ${stat:bad_signatures}
+access violation attempts .......... ${stat:access_violations}
+complete triplets .................. ${stat:complete_triplets}
+incomplete triplets ................ ${stat:incomplete_triplets}
+bad triplets ....................... ${stat:bad_triplets}
+expired triplets ................... ${stat:expired_triplets}
+triplet successes .................. ${stat:triplet_success}
+files uploaded ..................... ${stat:uploads}
+files archived ..................... ${stat:archives}
+symlinks created ................... ${stat:symlinks}
+symlinks removed ................... ${stat:rmsymlinks}
+
+Regards,
+Wydawca
+EOT;
+	}
+}
+
+notify-event {
+	event statistics;
+	module mailutils;
+}