Centered grade
[tpope-extra.git] / perl / sctweb
index 309c3e37a147843fb5c121745caf918b727632b1..1ca3d7c4fa6044246989c58d09c0d131d8b57db9 100755 (executable)
@@ -10,16 +10,67 @@ use strict;
 use LWP::UserAgent;
 use HTML::TableExtract;
 #use Time::Local;
-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::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 Nth_Weekday_of_Month_Year Gmtime Mktime);
 use Date::Calendar::Profiles qw($Profiles);
 use Date::Calendar::Year;
-use vars qw($ua %opts);
+use vars qw($ua %opts %faculty);
 
-my ($ts, $row, $response);
-my $url="https://sctweb.accd.edu/ia-bin4/tsrvweb.exe?WID=W&tserve_tip_read_destroy&tserve_host_code=4&tserve_tiphost_code=0";
+my ($response);
 
-if (-r $ENV{HOME} . "/.sctwebrc") {
-    open CONFIG, $ENV{HOME} . "/.sctwebrc";
+$opts{'holidays'} = { # %{$Profiles->{'US-TX'}},
+    "Martin Luther King Day"    => "3/Mon/Jan",
+    "Good Friday"               => "-2",
+    "Spring Break Monday"      => \&Spring_Break,
+    "Spring Break Tuesday"     => \&Spring_Break,
+    "Spring Break Wednesday"   => \&Spring_Break,
+    "Spring Break Thursday"    => \&Spring_Break,
+    "Spring Break Friday"      => \&Spring_Break,
+    "Spring Break Saturday"    => \&Spring_Break,
+    "Fiesta Holiday"            => "4/Fri/Apr",
+    "Memorial Day"              => "5/Mon/May",
+    "Independence Day"          => \&US_Independence,
+    "Labor Day"                 => \&US_Labor,
+    "Columbus Day"              => "2/Mon/Oct",
+    "Thanksgiving Day"          => "4/Thu/Nov",
+    "Thanksgiving Friday"       => \&Thanksgiving_Friday,
+};
+
+sub Spring_Break {
+    my($year,$label) = @_;
+    $label =~ s/^Spring Break //;
+    return( Add_Delta_Days(
+           Nth_Weekday_of_Month_Year($year,1,1,1),
+           7*(11-1) # This is for the 11th Monday of the year
+           +Decode_Day_of_Week($label)-1) );
+}
+
+sub Thanksgiving_Friday {
+    my($year,$label) = @_;
+    return( Add_Delta_Days(Nth_Weekday_of_Month_Year($year,11,4,4), 1) );
+}
+sub US_Independence # Fourth of July
+{
+    my($year,$label) = @_;
+    return( &Date::Calendar::Profiles::Nearest_Workday($year,7,4) );
+}
+sub US_Labor # First Monday after the first Sunday in September
+{
+    my($year,$label) = @_;
+    return( Add_Delta_Days(
+        Nth_Weekday_of_Month_Year($year,9,7,1), +1) );
+}
+
+my $config = $ENV{HOME} . "/.sctwebrc";
+if ($ARGV[0] eq '-F') {
+    shift;
+    $config = shift;
+}
+
+my $arg = "";
+$arg = shift if (defined($ARGV[0]) && $ARGV[0] =~ /^-\w$/);
+
+if (-r $config) {
+    open CONFIG, $config;
     while(<CONFIG>) {
        s/\#.*//;
        next unless m/^([^=]*)=(.*)/;
@@ -27,6 +78,8 @@ if (-r $ENV{HOME} . "/.sctwebrc") {
     }
     close CONFIG;
 }
+my $domain = $opts{'domain'} || "sctweb.accd.edu";
+my $url = "https://$domain/ia-bin4/tsrvweb.exe?WID=W&tserve_tip_read_destroy&tserve_host_code=4&tserve_tiphost_code=0";
 $url = $opts{'url'} if(defined($opts{'url'}));
 
 $ua = LWP::UserAgent->new;
@@ -39,6 +92,14 @@ $response = $ua->post("$url&tserve_trans_config=astulog.cfg", { tserve_tip_write
 $response = $ua->get("$url&tserve_tip_write=||WID|SID|PIN|Term&tserve_trans_config=" . ("regterm.cfg"||"rgrdterm.cfg")); # Valid terms
 die $response->status_line unless $response->is_success;
 my @terms = grep {s/^<option value="([^"]*)">.*/$1/} (split( /\r\n/, $response->content));
+if(@terms) {
+    $opts{school} = 'accd';
+} else {
+    $response = $ua->get("$url&tserve_tip_write=||WID|SID|PIN|Term&tserve_trans_config=aterm.cfg"); # Valid terms
+    die $response->status_line unless $response->is_success;
+    @terms = grep {s/&amp;Term=(\w*)$/$1/} (split( /\r\n/, $response->content));
+    $opts{school} = 'tamuk';
+}
 die "Site down. Try again later.\n" unless (@terms);
 
 sub generate_id {
@@ -49,23 +110,52 @@ sub generate_id {
     return $id;
 }
 
+sub next_class {
+    my %class = @_;
+    $class{'duration'} =~ /(\d\d\d\d)(\d\d)(\d\d)-(\d\d\d\d)(\d\d)(\d\d)/;
+    my $days = Delta_Days($1,$2,$3,$4,$5,$6);
+    my $firstday = Date::Calc->new($1,$2,$3);
+    my $lastday = Date::Calc->new($4,$5,$6);
+    my $today = Date::Calc->new(Date::Calc->localtime(time+3600*6)->date);
+    my @days=();
+    foreach(split(" ",$class{'days'})) {
+       push @days, Decode_Day_of_Week($_);
+    }
+    my @off = (off_for_holidays(%class),off_for_exams(%class));
+    for($today = ($today > $firstday ? $today : $firstday); $today < $lastday; $today++) {
+       next unless(grep($_ == Day_of_Week($today->date), @days));
+       next if(grep($_ == $today, @off));
+       return $today;
+    }
+    $today = Date::Calc->new(Date::Calc->gmtime->date);
+    for($today = ($today < $lastday ? $today : $lastday); $today > $firstday; $today--) {
+       next unless(grep($_ == Day_of_Week($today->date), @days));
+       next if(grep($_ == $today, @off));
+       return $today;
+    }
+    return undef;
+}
+
 sub off_for_holidays {
     my %class = @_;
     $class{'duration'} =~ /(\d\d\d\d)(\d\d)(\d\d)-(\d\d\d\d)(\d\d)(\d\d)/;
     my $days = Delta_Days($1,$2,$3,$4,$5,$6);
     my $firstday = Date::Calc->new($1,$2,$3);
     my $lastday = Date::Calc->new($4,$5,$6);
-    my $year = Date::Calendar::Year->new($1, $Profiles->{'US-TX'});
+    my $year = Date::Calendar::Year->new($1, $opts{'holidays'});
     my @holidays=();
     my @days=();
     foreach(split(" ",$class{days})) {
        $days[Decode_Day_of_Week($_)] = 1;
     }
     foreach ($year->search("")) {
+       my $good=1;
+       #foreach my $x ($year->labels($_)) {
+       #    $good=0 if ($x =~ /Veteran/ or $x =~ /President/);
+       #}
        next unless ($year->is_full($_) && $_>=$firstday && $_<=$lastday);
-       if (defined($days[Day_of_Week($_->date)])) {
-           push @holidays, $_;
-       }
+       push @holidays, $_
+           if (defined($days[Day_of_Week($_->date)]) && $good > 0);
     }
     return wantarray ? @holidays : "@holidays";
 }
@@ -91,18 +181,20 @@ sub off_for_exams {
        } elsif($time =~ /$ending/) {
            return $lastday-5;
        }
-    } else {
-       return wantarray ? () : "";
+    } elsif($days eq "5") {
+       return $lastday-2;
     }
+    return wantarray ? () : "";
 }
 
 sub capitalize {
     local $_ = shift;
+    s/ +$//;
     s/\b([A-Z])([A-Z]*)\b/$1\L$2/g;
     s/\b(I)(i*)\b/$1\U$2/g;
     s/\bUs\b/US/g;
     s/ (And|For|Of|Or|The|To|With) / \l$1 /g;
-    s/\b(Ma?c)([a-z])/$1\u$2/g;
+    s/\b(Mc)([a-z])/$1\u$2/g;
     s/\b(Tcp\/Ip|Pc)\b/\U$&/g;
     s/\bThru\b/Through/g;
     s/\bAcct\b/Accounting/g;
@@ -111,57 +203,74 @@ sub capitalize {
     s/\bComp\b/Composition/g;
     s/\bFed\b/Federal/g;
     s/\bGen\b/General/g;
+    s/\bIntro\b/Introduction/g;
+    s/\bPrgm\b/Programming/g;
+    s/\bOp Sys\b/Operating System/g;
     #s/\bGovt\b/Government/g;
     s/\bLit\b/Literature/g;
     s/\bPrin\b/Principles/g;
+    s/\bBus\b/Business/g;
     return $_;
 }
 
 sub get_schedule_terms {
-    my @terms;
+    my (@sterms, @a);
+    if($opts{school} eq 'tamuk') {
+       @a=('F','S','1','2');
+    } else {
+       @a=('1','2','3','4');
+    }
     my @localtime=localtime();
     if ($localtime[4]<3) { # Through Mar 31
-       @terms=((1900+$localtime[5])*10+2);
+       @sterms=((1900+$localtime[5]).$a[1]);
     } elsif ($localtime[4]<5) { # Through May 31
-       @terms=((1900+$localtime[5])*10+2,(1900+$localtime[5])*10+3);
+       @sterms=((1900+$localtime[5]).$a[1],(1900+$localtime[5]).$a[2]);
     } elsif ($localtime[4]<7) { # through July 31
-       @terms=((1900+$localtime[5])*10+3,(1900+$localtime[5])*10+4);
+       @sterms=((1900+$localtime[5]).$a[2],(1900+$localtime[5]).$a[3]);
     } elsif ($localtime[4]<8) { # through Aug 31
-       @terms=((1900+$localtime[5])*10+4,(1900+$localtime[5])*10+1);
+       @sterms=((1900+$localtime[5]).$a[3],(1900+$localtime[5]).$a[0]);
     } elsif ($localtime[4]<10) { # through Oct 31
-       @terms=((1900+$localtime[5])*10+1);
+       @sterms=((1900+$localtime[5]).$a[0]);
     } else {
-       @terms=((1900+$localtime[5])*10+1,(1901+$localtime[5])*10+2);
+       @sterms=((1900+$localtime[5]).$a[0],(1901+$localtime[5]).$a[1]);
     }
-    return @terms;
+    return @sterms;
 }
 
 sub get_schedule {
     my @readheaders = ("Section ID/Title", "Session", "Instructor", "Credits", "CallNumber","GradeType", "Days", "Time", "Start/EndDates", "Site/Building/Room", "Message");
     my $te = new HTML::TableExtract( headers => [ @readheaders ] );
-    my (@schedule, @terms, $classid, $begin, $end);
+    @readheaders = ("Course", "Days\xa0TimeLocation", "Session and Dates", "Instructor", "Credit", "CallNumber", "GradeType", "Message");
+    my $tf = new HTML::TableExtract( headers => [ @readheaders ] );
+    my (@schedule, @terms, $classid, $begin, $end, $times, $days, $session);
     @terms = get_schedule_terms();
-    foreach(@_ || @terms) {
+    foreach (@_ ? @_ : @terms) {
        $response = $ua->get("$url&tserve_tip_write=||WID|SID|PIN|Term&tserve_trans_config=rstusch.cfg&Term=".($_) );
        die $response->status_line unless $response->is_success;
        $te->parse($response->content);
+       $tf->parse($response->content);
+       #print $response->content;
     }
     foreach my $ts ($te->table_states) {
        foreach my $row ($ts->rows) {
            map { s/\xa0//g; $_} @$row;
            $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
-           $row->[0] =~ s/(.*) <BR>(.*)/capitalize($2)/eg;
+           $row->[0] =~ s/(.*) ?<[Bb][Rr][^>]*>(.*)/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$/) {
-               $begin =~ s/^(\d\d)/$1+12/e
-               if($1 < $2);
-               $end =~ s/^(\d\d)/$1+12/e;
+               if($1 < $2 && $2 != 12) {
+                   $begin =~ s/^(\d\d)/$1+12/e;
+               }
+               if($2 != 12) {
+                   $end =~ s/^(\d\d)/$1+12/e;
+               }
                $end =~ s/PM$//;
            } else { $end =~ s/AM$//; }
-           $row->[9] =~ s/ON CAMPUS\n//g;
+           $row->[8] =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
+           $row->[9] =~ s/(ON|MAIN) CAMPUS\n//ig;
            $row->[9] =~ s/\n/ /g;
            push @schedule, {
                id => $classid,
@@ -181,9 +290,76 @@ sub get_schedule {
            };
        }
     }
+    foreach my $ts ($tf->table_states) {
+       foreach my $row ($ts->rows) {
+           next if ($row->[0] =~ /Total Enrolled Hours/);
+           $row->[1] =~ s/\xa0/ /g;
+           map { s/\xa0//g; $_} @$row;
+           map { s/^\r?\n? *//g; $_} @$row;
+           $row->[0] =~ s/.*launchWebCT\("([^"]*)"[^)]*\).*>\s*//s;
+           $classid=$1;
+           $row->[0] =~ s/(.*)/capitalize($1)/eg;
+           $row->[1] =~ s/^([MTWRFS]*) *([0-9:-]*[AP]M)\s*//;
+           ($days, $times) = ($1, $2);
+           ($begin, $end) = split("-", $times);
+           if($times =~ /^(\d\d):\d\d-(\d\d):\d\dPM$/) {
+               if($1 < $2 && $2 != 12) {
+                   $begin =~ s/^(\d\d)/$1+12/e;
+               }
+               if($2 != 12) {
+                   $end =~ s/^(\d\d)/$1+12/e;
+               }
+               $end =~ s/PM$//;
+           } else { $end =~ s/AM$//; }
+           $row->[2] =~ s/(.*\S)\s*//;
+           $session = $1;
+           $row->[2] =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
+           $row->[2] =~ s/ *to */\n/g;
+           $row->[3] = capitalize($row->[3]);
+           $row->[3] =~ s/([A-Z]r?)$/$1./;
+           push @schedule, {
+               id => $classid,
+               title => $row->[0],
+               session => $session,
+               instructor => $row->[3],
+               credits => $row->[4],
+               callnumber => $row->[5],
+               gradetype => $row->[6],
+               days => $days,
+               'time' => $times,
+               begin => $begin,
+               end => $end || undef,
+               duration => $row->[2],
+               location => $row->[1],
+               message => $row->[7],
+           };
+       }
+    }
     return @schedule;
 }
 
+sub get_faculty_email {
+    my ($name, $school, $email);
+    if((-f $ENV{'HOME'} . "/public_html/faculty.csv") && ! %faculty) {
+       open INS, $ENV{'HOME'} . "/public_html/faculty.csv";
+       while($_ = <INS>) {
+           chomp;
+           m/"([^"]*)",([^,]*),([^,]*)/;
+           ($name, $email, $school) = ($1, $2, $3);
+           $name =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
+           $name =~ s/ [A-Z]\.//g;
+           $name = lc $name;
+           $name =~ s/\W//g;
+           $faculty{$name} = $email;
+       }
+    }
+    $name = shift;
+    $name =~ s/ [A-Z]r?\.//g;
+    $name = lc $name;
+    $name =~ s/\W//g;
+    return $faculty{$name};
+}
+
 sub get_mhc_header {
 return (
 "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",
@@ -203,7 +379,7 @@ 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);
+    my ($file, $current, @mhc, @schedule);
     $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
     @schedule = get_schedule(@_);
     @mhc = get_mhc_header;
@@ -212,7 +388,7 @@ sub do_mhc_schedule {
        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;
+           $_ =~ s/X-SC-Duration: (\d\d\d\d)(\d\d)(\d\d)-/"X-SC-Duration: $1$2$3-\nDate: $3 " . $mon[$2-1] . " 1970 12:00:00 +0000"/e;
            push @mhc2, $_;
        }
        @mhc = @mhc2;
@@ -222,7 +398,7 @@ sub do_mhc_schedule {
        my $id=generate_id($row->{'id'});
        $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
        $row->{'days'} =~ s/^ //;
-       $row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
+       #$row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
        my @day = map { "!" . $_ } (off_for_holidays(%$row),off_for_exams(%$row));
        $current = "";
        #print "# $id\n";
@@ -233,16 +409,16 @@ sub do_mhc_schedule {
        $current .= "X-SC-Time: ".$row->{'begin'}."-".$row->{'end'}."\n";
        $current .= "X-SC-Duration: " . $row->{'duration'} . "\n";
        $current .= "X-SC-Day: @day\n" if(exists $day[0]);
-       $current .= "X-SC-Alarm: 20 minutes\n";
+       $current .= "X-SC-Alarm: 15 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->{'instructor'} =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
+           my $email = get_faculty_email $row->{'instructor'};
+           $row->{'instructor'} = '"' . $row->{'instructor'} . '" <'. ($email || ($1 || "unknown") . "\@from.sctweb") . ">";
            $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 $next = next_class(%$row);
+           my @date = Gmtime(Mktime($next->date,$1,$2,0));
            $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";
@@ -269,12 +445,38 @@ sub do_mhc_schedule {
            close FH;
        }
     } else {
-       open(STDOUT, ">>" . $file) if(defined($file));
+       open(STDOUT, ">" . $file) if(defined($file));
        print "# MHC school schedule\n# Autogenerated by sctweb ".localtime()."\n\n";
        print join("\n", @mhc);
     }
 }
 
+sub do_csv_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 June July Aug. Sept. Oct. Nov. Dec.);
+    my (@terms, $file, $current, @mhc, @schedule);
+    $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
+    @schedule = get_schedule(@_);
+    open(STDOUT, ">" . $file) if(defined($file));
+    foreach my $row (@schedule) {
+       map {s/\n/-/g if defined; $_} %$row;
+       my $id=generate_id($row->{'id'});
+       $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
+       $row->{'days'} =~ s/^ //;
+       $row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
+       my $next = next_class(%$row);
+       $current = "";
+       #print "# $id\n";
+       $current .= $row->{'id'} . ",";
+       $current .= $row->{'title'} . ",";
+       $current .= '"' . $row->{'instructor'} . '",';
+       $next =~ /^(\d\d\d\d)(\d\d)(\d\d)$/;
+       $current .= $1 . "-". $2 ."-" . $3 . "\n";
+       print $current;
+    }
+}
+
 sub do_vcalendar_schedule {
     $| = 1;
     my %days = (M => "MO", T => "TU", W => "WE", R => "TH", F => "FR", S => "SA", U => "SU");
@@ -285,9 +487,10 @@ sub do_vcalendar_schedule {
     print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
     foreach my $row (@schedule) {
        map { s/\n/-/g; $_} %$row;
+       $row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
        $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
        $row->{'days'} =~ s/^ //;
-       $row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
+       #$row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
        my @day = (off_for_holidays(%$row),off_for_exams(%$row));
        my $day = "";
        if(exists($day[0])) {
@@ -312,7 +515,8 @@ sub do_vcalendar_schedule {
        print "DTEND:", $startdate."T".$stoptime, "00\r\n";
        print "RRULE:W1 ", $row->{'days'} . " $stopdate", "T000000\r\n";
        print("EXDATE:$day\r\n") if($day);
-       print "ATTENDEE;ROLE=OWNER;STATUS=CONFIRMED:", $opts{NAME}, "\r\n" if(defined($opts{NAME}));
+       print "ATTENDEE;ROLE=OWNER;STATUS=CONFIRMED:", $opts{'name'}, "\r\n" if(defined($opts{'name'}));
+       print "ATTENDEE;ROLE=ORGANIZER;STATUS=CONFIRMED:", $row->{'instructor'}, " <" . (get_faculty_email($row->{'instructor'}) || "fake\@ddress"), ">\r\n";
        print "END:VEVENT\r\n";
        if(defined($file) && (-d $file)) {
            print "END:VCALENDAR\r\n";
@@ -332,9 +536,18 @@ sub do_html_schedule {
        foreach my $row (@schedule) {
            map { s/\n/<br \/>/g; $_} %$row;
            $row->{'time'} =~ s/-/-<wbr \/>/;
+           $row->{'duration'} =~ s/\d\d(\d\d)(\d\d)(\d\d)/$2-$3-$1/g;
            print '<tr>';
            print "<td>" . $row->{'id'} . "<br />" . $row->{'title'} . "</td>";
-           print "<td>" . $row->{'instructor'} . "</td>";
+           my $instructor = $row->{'instructor'};
+           $instructor =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
+           my $email = get_faculty_email($instructor);
+           #if($email) {
+               #print '<td><a href="mailto:' . $email . '">'
+               #. $row->{'instructor'} . "</a></td>";
+           # } else {
+               print "<td>" . $row->{'instructor'} . "</td>";
+           #}
            print "<td>" . $row->{'days'} . "</td>";
            print "<td>" . $row->{'time'} . "</td>";
            print "<td>" . $row->{'duration'} . "</td>";
@@ -346,13 +559,16 @@ sub do_html_schedule {
 
 sub do_html_grades {
     my @readheaders = ("Section ID", "Course Title", "Grade", "Earned  Hours", "Quality  Hours", "Quality  Points", "GPA");
-    my @showheaders = ("Section ID", "Course Title", "Grade", "Earned<br />Hours", "Quality<br />Hours", "Quality<br />Points", "GPA");
+    my @showheaders = ("Section ID", "Course Title", "Grade", "Earned<br />Hours", "Quality<br />Hours", "Quality<br />Points");
     my ($row, $lastrow);
     my $te = new HTML::TableExtract( headers => [ @readheaders ] );
     my $response = $ua->get("$url&tserve_tip_write=||WID|SID|PIN|Term&tserve_trans_config=rgrdterm.cfg"); # Valid grading terms
     die $response->status_line unless $response->is_success;
-    my @terms = grep {s/^<option value="([^"]*)">.*/$1/} (split( /\r\n/, $response->content));
-    foreach(@ARGV || reverse @terms) {
+    #my @terms = reverse grep {s/^<option value="([^"]*)">.*/$1/} (split( /\r\n/, $response->content));
+    my @terms = ();
+    my $year = Date::Calc->localtime->year;
+    for(my $y=$year-4;$y<=$year;$y++) { push @terms, ($y.2,$y.3,$y.4,$y.1); }
+    foreach(@_ ? @_ : @terms) {
        $response = $ua->get("$url&tserve_tip_write=||WID|SID|PIN|Term&tserve_trans_config=rgrades.cfg&Term=".($_) );
        die $response->status_line unless $response->is_success;
        $te->parse($response->content);
@@ -360,47 +576,72 @@ sub do_html_grades {
     print '<table cellpadding="3" cellspacing="0">'."\n<tr><th>";
     print join("</th><th>",@showheaders);
     print "</th></tr>\n";
-    foreach $ts ($te->table_states) {
-       foreach $row ($ts->rows) {
+    foreach my $ts ($te->table_states) {
+       foreach my $row ($ts->rows) {
            map { s/\xa0//g; s/\n/<br \/>/g; $_} @$row;
            $row->[1] = capitalize($row->[1]);
            $lastrow=$row;
            next if $row->[0] =~ /:/;
            print '<tr><td>';
-           print join('</td><td>', @$row);
+           print $$row[0], '</td><td>', $$row[1], '</td>';
+           print '<td align="center">', $$row[2], '</td><td>';
+           #print join('</td><td>', @$row[0 .. 1]);
+           print join('</td><td>', @$row[3 .. 5]);
            print "</td></tr>\n";
        }
     }
     print '<tr><td colspan="2">', capitalize($lastrow->[0]);
-    shift @$lastrow; shift @$lastrow;
+    #shift @$lastrow; shift @$lastrow;
     print "</td><td>";
-    print join('</td><td>', @$lastrow);
+    print $$lastrow[6];
+    print "</td><td>";
+    print join('</td><td>', @$lastrow[3 .. 5]);
     print "</td></tr>\n";
     print "</table>\n";
 }
 
+sub do_faculty {
+    my @readheaders = ("Name", "College", "Email");
+    my $te = new HTML::TableExtract( headers => [ @readheaders ] );
+    foreach(qw(a b c d e f g h i j k l m n o p q r s t u v w x y z)) {
+       my $response = $ua->get("http://$domain/fs/".$_."dir.htm");
+       die $response->status_line unless $response->is_success;
+       $te->parse($response->content);
+    }
+    foreach my $ts ($te->table_states) {
+       foreach my $row ($ts->rows) {
+           map { s/[\r\n]//g; $_} @$row;
+           $row->[0] = capitalize($row->[0]);
+           $row->[0] =~ s/([A-Z]r?)$/$1./;
+           print '"'.$row->[0].'",',$row->[2].',', $row->[1], "\n";
+       }
+    }
+}
+
 sub do_transcripts {
     $response = $ua->get("$url&tserve_tip_write=||WID|SID|PIN&tserve_trans_config=rtranscr.cfg&CareerReqNum=1");
     foreach (split /\n/, $response->content) {
        next unless s/^\&nbsp;|<pre>// || s/\&nbsp;/ /;
-       s/<\/?[Hh]\d>//g;
+       s/<\/?([Hh]\d|[Bb])>//g;
+       next if /<\/td>/;
        print "$_\n";
     }
 }
 
-my $arg = "";
-$arg = shift if (defined($ARGV[0]) && $ARGV[0] =~ /^-\w$/);
-
 if ($arg eq "-g") {
     do_html_grades(@ARGV);
 } elsif ($arg eq "-s") {
     do_html_schedule(@ARGV);
 } elsif ($arg eq "-m") {
     do_mhc_schedule(@ARGV);
+} elsif ($arg eq "-c") {
+    do_csv_schedule(@ARGV);
 } elsif ($arg eq "-v") {
     do_vcalendar_schedule(@ARGV);
 } elsif ($arg eq "-t") {
     do_transcripts;
+} elsif ($arg eq "-f") {
+    do_faculty;
 }
 
 $ua->get("$url&tserve_trans_config=alogout.cfg"); # Logout