Assorted away-tpope updates
[tpope-extra.git] / perl / sctweb
index 43e82361ed0e4afa5c8033abc252652a7c8985fd..5d82c6c786de6e11a746ae3bd9292137e049a287 100755 (executable)
@@ -6,20 +6,75 @@
 # Create a ~/.sctwebrc that has SID=yourssn and PIN=yourpin
 # You'll need to change the url below if you go anywhere but Northwest Vista.
 
+# Update: This tool now only outputs in XML.  For other formats, convert
+# with schedproc
+
 use strict;
-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 Nth_Weekday_of_Month_Year Gmtime Mktime);
 use Date::Calendar::Profiles qw($Profiles);
 use Date::Calendar::Year;
-use vars qw($ua %opts);
+use HTML::TableExtract;
+use LWP::UserAgent;
+use XML::Simple;
+use vars qw($ua %opts %faculty);
+
+my ($response);
+
+$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) );
+}
 
-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";
+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;
+}
 
-if (-r $ENV{HOME} . "/.sctwebrc") {
-    open CONFIG, $ENV{HOME} . "/.sctwebrc";
+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 +82,9 @@ 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;
 $ua->timeout(10);
@@ -37,16 +95,16 @@ $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));
-die "Site down. Try again later.\n" unless (@terms);
-
-sub generate_id {
-    my ($section, $number) = split("-", shift);
-    my $id = 0;
-    foreach (split //, $section) {$id=26*$id+(ord($_)-1)%32;}
-    $id=10000*$id+$number;
-    return $id;
+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 off_for_holidays {
     my %class = @_;
@@ -54,17 +112,20 @@ sub off_for_holidays {
     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";
 }
@@ -90,18 +151,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;
+    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;
@@ -110,284 +173,254 @@ 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./;
+           $row->[2] =~ s/^([^,]*), ([^,.]*|[^,]{4,})/$2 $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, {
+           my %class = (
                id => $classid,
                title => $row->[0],
-               session => $row->[1],
-               instructor => capitalize($row->[2]),
+               #session => $row->[1],
+               instructor => $row->[2],
                credits => $row->[3],
-               callnumber => $row->[4],
-               gradetype => $row->[5],
+               crn => $row->[4],
+               #gradetype => $row->[5],
                days => $row->[6],
-               'time' => $row->[7],
+               #'time' => $row->[7],
                begin => $begin,
                end => $end || undef,
                duration => $row->[8],
                location => $row->[9],
-               message => $row->[10],
-           };
+               #message => $row->[10],
+           );
+           my @off = ( map { "$_"; } (off_for_holidays(%class), off_for_exams(%class)));
+           $class{'off'} = [ @off ] if (@off);
+           push @schedule, \%class;
        }
     }
-    return @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: 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",
-);
-}
-
-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");
-    my (@terms, $file, $current, @mhc, @schedule);
-    $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'});
-       $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
-       $row->{'days'} =~ s/^ //;
-       $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";
-       $current .= "X-SC-Subject: " . $row->{'title'} . "\n";
-       $current .= "X-SC-Location: " . $row->{'location'} . "\n";
-       $current .= "X-SC-Category: School\n";
-       $current .= "X-SC-Cond: " . $row->{'days'} . "\n";
-       $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-Record-Id: <".$row->{'id'}."\@from.sctweb>\n";
-       #print "\n$current";
-       push @mhc, $current;
-    }
-    if(defined($file) && (-d $file)) {
-       my @lines;
-       foreach my $name (<$file/[1-9]*>) {
-           next unless $name =~ /^$file\/[1-9][0-9]*$/;
-           open FH, $name;
-           @lines = <FH>;
-           close FH;
-           foreach (@lines) {
-               unlink $name if /^X-SC-Record-Id: <.*\@from.sctweb>/;
-           }
-       }
-       my $i=0;
-       foreach (@mhc) {
-           while(-f ++$i) {}
-           open FH, ">$file/$i" or die $!;
-           print FH $_;
-           close FH;
+    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 */-/g;
+           $row->[3] = capitalize($row->[3]);
+           $row->[3] =~ s/([A-Z]r?)$/$1./;
+           $row->[3] =~ s/^([^,]*), ([^,.]{3}[^,]*)/$2 $1/;
+           my %class = (
+               id => $classid,
+               title => $row->[0],
+               #session => $session,
+               instructor => $row->[3],
+               credits => $row->[4],
+               crn => $row->[5],
+               #gradetype => $row->[6],
+               days => $days,
+               #'time' => $times,
+               begin => $begin,
+               end => $end || undef,
+               duration => $row->[2],
+               location => $row->[1],
+               #message => $row->[7],
+           );
+           my @off = ( map { "$_"; } (off_for_holidays(%class), off_for_exams(%class)));
+           $class{'off'} = [ @off ] if (@off);
+           push @schedule, \%class;
        }
-    } else {
-       open(STDOUT, ">>" . $file) if(defined($file));
-       print "# MHC school schedule\n# Autogenerated by sctweb ".localtime()."\n\n";
-       print join("\n", @mhc);
     }
+    return @schedule;
 }
 
-sub do_vcalendar_schedule {
-    $| = 1;
-    my %days = (M => "MO", T => "TU", W => "WE", R => "TH", F => "FR", S => "SA", U => "SU");
+sub do_xml_schedule {
     my $file = shift if (defined $_[0] and $_[0] !~ /^\d/);
-    my @schedule = get_schedule(@_);
-    open(STDOUT, ">>" . $file) if(defined($file) && (! -d $file));
-    open(STDOUT, ">/dev/null") if(defined($file) && (-d $file));
-    print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
-    foreach my $row (@schedule) {
-       map { s/\n/-/g; $_} %$row;
-       $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
-       $row->{'days'} =~ s/^ //;
-       $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])) {
-           $day = join(";", @day);
-           $day =~ s/\b(\d{8})\b/$1T000000/g;
-       }
-       my ($starttime, $stoptime)=($row->{'begin'}, $row->{'end'});
-       my ($startdate, $stopdate)=split(/-/, $row->{'duration'});
-       $starttime =~ s/://;
-       $stoptime =~ s/://;
-       if(defined($file) && (-d $file)) {
-           open FH, ">$file/" . $row->{'id'} . ".vcs" or die "$!";
-           select FH;
-           print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
-       }
-       print "BEGIN:VEVENT\r\n";
-       print "SUMMARY:", $row->{'title'}, "\r\n";
-       print "DESCRIPTION:", $row->{'id'}, "\r\n";
-       print "LOCATION:", $row->{'location'}, "\r\n";
-       print "CATEGORIES:Education\r\n";
-       print "DTSTART:", $startdate."T".$starttime, "00\r\n";
-       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 "END:VEVENT\r\n";
-       if(defined($file) && (-d $file)) {
-           print "END:VCALENDAR\r\n";
-           close FH;
-           select STDOUT;
-       }
+    my $schedule = { class => [ get_schedule(@_) ] };
+    my $xml = XMLout($schedule, NoAttr => 1, RootName => 'schedule');
+    if($file) {
+       open FH, ">$file";
+       print FH $xml;
+       close FH;
+    } else {
+       print $xml;
     }
-    print "END:VCALENDAR\r\n";
-}
-
-sub do_html_schedule {
-    my @showheaders = ("Section ID/Title", "Instructor", "Days", "Time", "Duration", "Location");
-    my @schedule = get_schedule(@_);
-    print '<table cellpadding="3" cellspacing="0">'."\n<tr><th>";
-    print join("</th><th>",@showheaders);
-    print "</th></tr>\n";
-       foreach my $row (@schedule) {
-           map { s/\n/<br \/>/g; $_} %$row;
-           $row->{'time'} =~ s/-/-<wbr \/>/;
-           print '<tr>';
-           print "<td>" . $row->{'id'} . "<br />" . $row->{'title'} . "</td>";
-           print "<td>" . $row->{'instructor'} . "</td>";
-           print "<td>" . $row->{'days'} . "</td>";
-           print "<td>" . $row->{'time'} . "</td>";
-           print "<td>" . $row->{'duration'} . "</td>";
-           print "<td>" . $row->{'location'} . "</td>";
-           print "</tr>\n";
-       }
-    print "</table>\n";
 }
 
-sub do_html_grades {
+sub do_xml_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");
+    @readheaders = ("Section", "Course Title", "FinalGrade", "Earned Hours", "Quality Hours", "Quality Points", "GPA") if($opts{'school'} eq 'tamuk');
     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 @grades = ();
+    my @terms = ();
+    my $year = Date::Calc->localtime->year;
+    for(my $y=$year-4;$y<=$year;$y++) { push @terms, ($y.2,$y."F",$y.3,$y.4,$y.1,$y."S"); }
+    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);
     }
-    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) {
-           map { s/\xa0//g; s/\n/<br \/>/g; $_} @$row;
+    foreach my $ts ($te->table_states) {
+       foreach my $row ($ts->rows) {
+           map { s/^\s+//; s/\xa0|\r//g; s/\n/<br \/>/g; $_} @$row;
            $row->[1] = capitalize($row->[1]);
+           $row->[1] =~ s/&/&amp;/g;
+           $row->[0] =~ s/Cumulative through/Cumulative: through/;
+           $row->[0] =~ s/Cumulative:(.*) (\d{4}) (.*)/Cumulative:$1 $3 $2/;
            $lastrow=$row;
-           next if $row->[0] =~ /:/;
-           print '<tr><td>';
-           print join('</td><td>', @$row);
-           print "</td></tr>\n";
+           next if $row->[0] =~ /:|Current Term/;
+           push @grades, {
+               id => $row->[0],
+               title => $row->[1],
+               grade => $row->[2],
+               earned => $row->[3],
+               hours => $row->[4],
+               points => $row->[5]
+           };
        }
     }
-    print '<tr><td colspan="2">', capitalize($lastrow->[0]);
-    shift @$lastrow; shift @$lastrow;
-    print "</td><td>";
-    print join('</td><td>', @$lastrow);
+    $lastrow->[0] =~ s/Cumulative:? *through *//i;
+    my $cumulative = { term => capitalize($lastrow->[0]),
+                      gpa => $lastrow->[6],
+                      earned => $lastrow->[3],
+                      hours => $lastrow->[4],
+                      points => $lastrow->[5]
+                  };
+    my $xml = XMLout({class => [@grades], cumulative => $cumulative}, NoAttr => 1, RootName => 'grades');
+    print $xml;
+    return;
+    print '<tr class="cumulative"><td id="cumulative" colspan="2">', capitalize($lastrow->[0]);
+    #shift @$lastrow; shift @$lastrow;
+    print '</td><td align="center" id="gpa" class="grade">';
+    print $$lastrow[6];
+    print '</td><td align="right" class="right-number">';
+    print join('</td><td align="right" class="right-number">', @$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 "-v") {
-    do_vcalendar_schedule(@ARGV);
+    do_xml_grades(@ARGV);
 } elsif ($arg eq "-t") {
     do_transcripts;
+} elsif ($arg eq "-f") {
+    do_faculty;
+} elsif ($arg eq "-x" || $arg eq "-s" || 1) {
+    do_xml_schedule(@ARGV);
 }
 
 $ua->get("$url&tserve_trans_config=alogout.cfg"); # Logout