More MHC headers

diff --git a/perl/sctweb b/perl/sctweb
index 43e82361ed0e4afa5c8033abc252652a7c8985fd..d628285b32c366826032b3cbda984d3ab06f6d3e 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -10,7 +10,7 @@ use strict;
 use LWP::UserAgent;
 use HTML::TableExtract;
 #use Time::Local;
 use LWP::UserAgent;
 use HTML::TableExtract;
 #use Time::Local;

-use Date::Calc::Object qw(Day_of_Week Decode_Day_of_Week Delta_Days);
+use Date::Calc::Object qw(Day_of_Week Decode_Day_of_Week Week_of_Year Monday_of_Week Day_of_Week_Abbreviation Delta_Days Add_Delta_Days Gmtime Mktime);

 use Date::Calendar::Profiles qw($Profiles);
 use Date::Calendar::Year;
 use vars qw($ua %opts);
 use Date::Calendar::Profiles qw($Profiles);
 use Date::Calendar::Year;
 use vars qw($ua %opts);


@@ -27,6 +27,7 @@ if (-r $ENV{HOME} . "/.sctwebrc") {
     }
     close CONFIG;
 }
     }
     close CONFIG;
 }

+$url = $opts{'url'} if(defined($opts{'url'}));

 
 $ua = LWP::UserAgent->new;
 $ua->timeout(10);
 
 $ua = LWP::UserAgent->new;
 $ua->timeout(10);


@@ -151,6 +152,7 @@ sub get_schedule {
            $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
            $row->[0] =~ s/(.*) <BR>(.*)/capitalize($2)/eg;
            $classid=$1;
            $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
            $row->[0] =~ s/(.*) <BR>(.*)/capitalize($2)/eg;
            $classid=$1;

+           $row->[2] = capitalize($row->[2]);

            $row->[2] =~ s/([A-Z]r?)$/$1./;
            ($begin, $end) = split("-", $row->[7]);
            if($row->[7] =~ /^(\d\d):\d\d-(\d\d):\d\dPM$/) {
            $row->[2] =~ s/([A-Z]r?)$/$1./;
            ($begin, $end) = split("-", $row->[7]);
            if($row->[7] =~ /^(\d\d):\d\d-(\d\d):\d\dPM$/) {


@@ -165,7 +167,7 @@ sub get_schedule {
                id => $classid,
                title => $row->[0],
                session => $row->[1],
                id => $classid,
                title => $row->[0],
                session => $row->[1],

-               instructor => capitalize($row->[2]),
+               instructor => $row->[2],

                credits => $row->[3],
                callnumber => $row->[4],
                gradetype => $row->[5],
                credits => $row->[3],
                callnumber => $row->[4],
                gradetype => $row->[5],


@@ -197,17 +199,6 @@ return (
 );
 }
 
 );
 }
 

-sub print_mhc_header {
-my $header .= join("\n", get_mhc_header) . "\n";
-    if(defined($_[0])) {
-       open SCHEDULE, (">" . $_[0]);
-       print SCHEDULE $header;
-       close SCHEDULE;
-    } else {
-       print $header;
-    }
-}
-

 sub do_mhc_schedule {
     $| = 1;
     my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat", U => "SU");
 sub do_mhc_schedule {
     $| = 1;
     my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat", U => "SU");


@@ -215,7 +206,6 @@ sub do_mhc_schedule {
     $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
     @schedule = get_schedule(@_);
     @mhc = get_mhc_header;
     $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
     @schedule = get_schedule(@_);
     @mhc = get_mhc_header;

-    #print_mhc_header($file);

     foreach my $row (@schedule) {
        map {s/\n/-/g if defined; $_} %$row;
        my $id=generate_id($row->{'id'});
     foreach my $row (@schedule) {
        map {s/\n/-/g if defined; $_} %$row;
        my $id=generate_id($row->{'id'});


@@ -234,6 +224,19 @@ sub do_mhc_schedule {
        $current .= "X-SC-Day: @day\n" if(exists $day[0]);
        $current .= "X-SC-Alarm: 20 minutes\n";
        $current .= "X-SC-Record-Id: <".$row->{'id'}."\@from.sctweb>\n";
        $current .= "X-SC-Day: @day\n" if(exists $day[0]);
        $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->{'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";
+       }

        #print "\n$current";
        push @mhc, $current;
     }
        #print "\n$current";
        push @mhc, $current;
     }