[project @ 1999-12-17 19:44:07 by gecko]

[debbugs.git] / scripts / process.in

diff --git a/scripts/process.in b/scripts/process.in
index 9cd3e7c7cf1c42abf6eb126019876c6615d5802a..ea4127c8cd3aec1a08682dabc5438c2105ccef95 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.4 1999/09/16 19:42:50 gecko Exp $
+# $Id: process.in,v 1.11 1999/12/17 19:44:08 gecko Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -8,7 +8,6 @@ use Mail::Address;
 require( '/etc/debbugs/config' );
 require( '/usr/lib/debbugs/errorlib' );
 chdir( "$gSpoolDir" ) || die 'chdir spool: $!\n';
-@showseverities=();
 
 #open(DEBUG,"> /tmp/debbugs.debug");
 
@@ -98,6 +97,7 @@ while (defined ($msg[$i] ) )
        print DEBUG ">$fn|$'|\n";
     $fwd .= $fn.': '.$fv."\n";
     $fn =~ y/A-Z/a-z/;
+    $fv =~ y/A-Z/a-z/;
     $pheader{$fn}= $fv;
        print DEBUG ">$fn~$fv<\n";
 }
@@ -290,7 +290,7 @@ $gMaintainer
 END
         } else 
                {   &htmllog("Reply","sent",$replyto,"You have taken responsibility.");
-            &sendmessage(<<END.$x, '');
+            &sendmessage(<<END."--------------------------------------\n".$x."---------------------------------------\n".join( "\n", @msg ), '');
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $replyto
 ${noticecc}Subject: $gBug#$ref: marked as done ($s_subject)
@@ -406,7 +406,7 @@ X-$gProject-PR-Message: error
 
 Your message didn't have a Package: line at the start (in the
 pseudo-header following the real mail header), or didn't have a
-psuedo-header at all.
+pseudo-header at all.
 
 This makes it much harder for us to categorise and deal with your
 problem report. Please resubmit your report and tell us which package the
@@ -424,23 +424,22 @@ $gMaintainer
 END
        &appendlog;
        &finish;
-    } else {
-        $s_package= $pheader{'package'};
-               print "Package: $s_package\n";
-    }
+    } else { $s_package= $pheader{'package'}; }
     if (defined($pheader{'keywords'})) {
         $s_keywords= $pheader{'keywords'};
     }
     $s_severity= '';
-    if (defined($pheader{'severity'})) {
-        $s_severity= $pheader{'severity'};
-       if (!grep($_ eq $s_severity, @severities, "$gDefaultSeverity")) {
+       if (defined($pheader{'severity'}) || defined($pheader{'priority'})) 
+       {       $s_severity= $pheader{'severity'};
+           $s_severity= $pheader{'priority'} unless ($s_severity);
+
+               if (!grep($_ eq $s_severity, @severities, "$gDefaultSeverity")) {
             $brokenness.= <<END;
 
-Your message specified a Severity: in the psuedo-header, but
+Your message specified a Severity: in the pseudo-header, but
 the severity value $s_severity was not recognised.
 The default severity $gDefaultSeverity is being used instead.
-The recognised values are: @showseverities.
+The recognised values are: @gSeverityList.
 END
             $s_severity= '';
         }
@@ -466,7 +465,7 @@ print DEBUG "maintainers >@maintaddrs<\n";
 $orgsender= defined($header{'sender'}) ? "Orignal-Sender: $header{'sender'}\n" : '';
 $newsubject= $subject;  $newsubject =~ s/^$gBug#$ref\W*\s*//;
 
-$xcchdr= $header{X-Debbugs-CC};
+$xcchdr= $header{ 'x-debbugs-cc' };
 if ($xcchdr =~ m/\S/) {
     push(@resentccs,$xcchdr);
     $resentccexplain.= <<END;
@@ -492,7 +491,7 @@ if ($codeletter eq 'M' && !@maintaddrs) {
 
 You requested that the message be sent to the package maintainer(s)
 but either the $gBug report is not associated with any package (probably
-because of a missing Package psuedo-header field in the original $gBug
+because of a missing Package pseudo-header field in the original $gBug
 report), or the package(s) specified do not have any maintainer(s).
 
 Your message has *not* been sent to any package maintainers; it has
@@ -779,12 +778,23 @@ sub get_addresses {
 sub sendmessage {
     local ($msg,@recips) = @_;
     if ($recips[0] eq '' && $#recips == 0) { @recips= ('-t'); }
+
+       #save email to the log
     open(AP,">>db/$ref.log") || &quit("opening db/$ref.log (lo): $!");
     print(AP "\2\n",join("\4",@recips),"\n\5\n$msg\n\3\n") ||
         &quit("writing db/$ref.log (lo): $!");
     close(AP) || &quit("closing db/$ref.log (lo): $!");
     
-    print DEBUG "mailing to >",join('|',@recips),"<\n";
+       #if debbuging.. save email to a log
+#      open AP, ">>debug";
+#      print AP join( '|', @recips )."\n>>";
+#      print AP get_addresses( @recips );
+#      print AP "<<\n".$msg;
+#      print AP "\n--------------------------------------------------------\n";
+#      close AP;
+
+       #start mailing
+       $_ = '';
     $SIG{'CHLD'}='chldhandle';
        #print DEBUG "mailing sigchild set up<\n";
        $chldexit = 'no';