X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2FMAPSDeliver;h=38596c0796f41f6f0bfef69b35126f10eca3cf57;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=05ceafd813ead51fadfee6405a354cca89a2b99d;hpb=aed243fe03fc8f9b40f753ea1ef85ce59cce9011;p=clearscm.git

diff --git a/maps/bin/MAPSDeliver b/maps/bin/MAPSDeliver
index 05ceafd..38596c0 100755
--- a/maps/bin/MAPSDeliver
+++ b/maps/bin/MAPSDeliver
@@ -20,13 +20,14 @@ use warnings;
 
 use FindBin;
 
-use lib $FindBin::Bin;
+use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPSFile;
-use MAPSDB;
+use MAPS;
 use MAPSLog;
 
-sub DeliverMail ($$) {
+sub DeliverMail($$) {
   my ($userid, $msgfileName) = @_;
 
   # Open maildrop file
@@ -42,8 +43,7 @@ sub DeliverMail ($$) {
 
   # Write msgfile -> $maildrop
   print $maildrop "\n\n";
-  print $maildrop $_
-    while (<$msgfile>);
+  print $maildrop $_ while (<$msgfile>);
 
   # Unlock the file
   Unlock $maildrop;
@@ -61,14 +61,19 @@ my ($userid, $msgfile) = @ARGV;
 die 'User id not specified' unless $userid;
 die 'Msgfile not specified' unless $msgfile;
 
-my $err  = DeliverMail $userid, $msgfile;
+my $errmsg = DeliverMail($userid, $msgfile);
 
-if ($err) {
-  OpenDB 'mapsadmin', 'mapsadmin';
+if ($errmsg) {
+  #OpenDB('maps', 'spam');
 
-  MAPSDB::SetContext $userid;
+  SetContext($userid);
 
-  Error $err;
+  Error(
+    userid  => $userid,
+    message => $errmsg,
+  );
+
+  exit 1;
 } # if
 
-exit $err ? 1 : 0;
+exit 0;