Additional MHC holiday headers

diff --git a/perl/sctweb b/perl/sctweb
index d628285b32c366826032b3cbda984d3ab06f6d3e..309c3e37a147843fb5c121745caf918b727632b1 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -186,26 +186,37 @@ sub get_schedule {
 
 sub get_mhc_header {
 return (
-"X-SC-Subject: New Years Day\nX-SC-Category: Holiday\nX-SC-Cond: 1 Jan\nX-SC-Record-Id: <New_Years_Day\@from.sctweb>\n",
-"X-SC-Subject: Martin Luther King, Jr. Day\nX-SC-Category: Holiday\nX-SC-Cond: 3rd Mon Jan\nX-SC-Duration: 19861102-\nX-SC-Record-Id: <Martin_Luther_King_Jr_Day\@from.sctweb>\n",
+"X-SC-Subject: New Years Day\nX-SC-Category: Holiday\nX-SC-Cond: 1 Jan\nX-SC-Duration: 00010101-\nX-SC-Record-Id: <New_Years_Day\@from.sctweb>\n",
+"X-SC-Subject: Martin Luther King, Jr. Day\nX-SC-Category: Holiday\nX-SC-Cond: 3rd Mon Jan\nX-SC-Duration: 19870119-\nX-SC-Record-Id: <Martin_Luther_King_Jr_Day\@from.sctweb>\n",
 "X-SC-Subject: Presidents Day\nX-SC-Category: Holiday\nX-SC-Cond: 3rd Mon Feb\nX-SC-Duration: 19710515-\nX-SC-Record-Id: <Presidents_Day\@from.sctweb>\n",
 "X-SC-Subject: Memorial Day\nX-SC-Category: Holiday\nX-SC-Cond: Last Mon May\nX-SC-Duration: 19710531-\nX-SC-Record-Id: <Memorial_Day\@from.sctweb>\n",
 "X-SC-Subject: Independence Day\nX-SC-Category: Holiday\nX-SC-Cond: 4 Jul\nX-SC-Duration: 17760704-\nX-SC-Record-Id: <Independence_Day\@from.sctweb>\n",
 "X-SC-Subject: Labor Day\nX-SC-Category: Holiday\nX-SC-Cond: 1st Mon Sep\nX-SC-Duration: 18840901-\nX-SC-Record-Id: <Labor_Day\@from.sctweb>\n",
 "X-SC-Subject: Columbus Day\nX-SC-Category: Holiday\nX-SC-Cond: 2nd Mon Oct\nX-SC-Duration: 19711011-\nX-SC-Record-Id: <Columbus_Day\@from.sctweb>\n",
 "X-SC-Subject: Veterans Day\nX-SC-Category: Holiday\nX-SC-Cond: 11 Nov\nX-SC-Duration: 19261111-\nX-SC-Record-Id: <Veterans_Day\@from.sctweb>\n",
-"X-SC-Subject: Thanksgiving\nX-SC-Category: Holiday\nX-SC-Cond: 4th Thu Nov\nX-SC-Record-Id: <Thanksgiving\@from.sctweb>\n",
-"X-SC-Subject: Christmas\nX-SC-Category: Holiday\nX-SC-Cond: 25 Dec\nX-SC-Record-Id: <Christmas\@from.sctweb>\n",
+"X-SC-Subject: Thanksgiving\nX-SC-Category: Holiday\nX-SC-Cond: 4th Thu Nov\nX-SC-Duration: 14921122-\nX-SC-Record-Id: <Thanksgiving\@from.sctweb>\n",
+"X-SC-Subject: Christmas\nX-SC-Category: Holiday\nX-SC-Cond: 25 Dec\nX-SC-Duration: 00011225-\nX-SC-Record-Id: <Christmas\@from.sctweb>\n",
 );
 }
 
 sub do_mhc_schedule {
     $| = 1;
     my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat", U => "SU");
+    my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
     my (@terms, $file, $current, @mhc, @schedule);
     $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
     @schedule = get_schedule(@_);
     @mhc = get_mhc_header;
+    if(defined($file) && (-d $file)) {
+       my @mhc2;
+       foreach (@mhc) {
+           $_ =~ s/X-SC-Subject: ([^\n]*)/X-SC-Subject: $1\nSubject: $1/;
+           $_ =~ s/X-SC-Category: ([^\n]*)/X-SC-Category: $1\nFrom: $1/;
+           $_ =~ s/X-SC-Duration: (\d\d\d\d)(\d\d)(\d\d)-/"X-SC-Duration: $1$2$3-\nDate: $3 " . $mon[$2-1] . " 2037 00:00:00 +0000"/e;
+           push @mhc2, $_;
+       }
+       @mhc = @mhc2;
+    }
     foreach my $row (@schedule) {
        map {s/\n/-/g if defined; $_} %$row;
        my $id=generate_id($row->{'id'});
@@ -225,14 +236,13 @@ sub do_mhc_schedule {
        $current .= "X-SC-Alarm: 20 minutes\n";
        $current .= "X-SC-Record-Id: <".$row->{'id'}."\@from.sctweb>\n";
        if(defined($file) && (-d $file)) {
-           $row->{'instructor'} =~ s/(.*), (.*)/$2 $1 <$1\@from.sctweb>/;
+           $row->{'instructor'} =~ s/(.*), (.*)/"$2 $1" <$1\@from.sctweb>/;
            $row->{'days'} =~ s/ .*$//;
            $row->{'duration'} =~ /^(\d\d\d\d)(\d\d)(\d\d)-\d{8}$/;
            my @date = Add_Delta_Days(Monday_of_Week(Week_of_Year
                    ($1,$2,$3)),Decode_Day_of_Week($row->{'days'})-1);
            $row->{'begin'} =~ /^(\d\d):(\d\d)$/;
            @date = Gmtime(Mktime(@date,$1,$2,0));
-           my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
            $current .= sprintf "Date: %s, %2d %s %4d %02d:%02d:00 +0000\n", Day_of_Week_Abbreviation($date[7]), $date[2], $mon[$date[1]-1], $date[0], $date[3], $date[4], $date[5];
            $current .= "Subject: " . $row->{'title'} . "\n";
            $current .= "From: " . $row->{'instructor'} . "\n";