Grr, freakin' carriage returns...

[tpope-extra.git] / perl / sctweb

diff --git a/perl/sctweb b/perl/sctweb
index 597ce83ccd00b63ccacd7ef2fe5a03192245be85..2380f31074598f540a57a3845aa1899b2d902ebb 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -61,7 +61,7 @@ sub US_Labor # First Monday after the first Sunday in September
 }
 
 my $config = $ENV{HOME} . "/.sctwebrc";
-if ($ARGV[0] eq '-f') {
+if ($ARGV[0] eq '-F') {
     shift;
     $config = shift;
 }
@@ -181,12 +181,14 @@ sub off_for_exams {
        } elsif($time =~ /$ending/) {
            return $lastday-5;
        }
+    } 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;
@@ -230,7 +232,7 @@ sub get_schedule_terms {
     } elsif ($localtime[4]<10) { # through Oct 31
        @sterms=((1900+$localtime[5]).$a[0]);
     } else {
-       @sterms=((1900+$localtime[5])."1",(1901+$localtime[5])."2");
+       @sterms=((1900+$localtime[5]).$a[0],(1901+$localtime[5]).$a[1]);
     }
     return @sterms;
 }
@@ -557,7 +559,8 @@ 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");
+    @readheaders = ("Section", "Course Title", "FinalGrade", "Earned Hours", "Quality Hours", "Quality Points", "GPA") if($opts{'school'} eq 'tamuk');
+    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
@@ -565,30 +568,37 @@ sub do_html_grades {
     #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); }
+    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 $showheaders[0], '</th><th>';
+    print join('</th><th>',@showheaders[1 .. 5]);
     print "</th></tr>\n";
     foreach my $ts ($te->table_states) {
        foreach my $row ($ts->rows) {
-           map { s/\xa0//g; s/\n/<br \/>/g; $_} @$row;
+           map { s/^\s+//; s/\xa0|\r//g; s/\n/<br \/>/g; $_} @$row;
            $row->[1] = capitalize($row->[1]);
+           $row->[1] =~ s/&/&amp;/g;
            $lastrow=$row;
-           next if $row->[0] =~ /:/;
+           next if $row->[0] =~ /:|Current Term|Cumulative/;
            print '<tr><td>';
-           print join('</td><td>', @$row);
+           print $$row[0], '</td><td>', $$row[1], '</td>';
+           print '<td align="center">';
+           #print join('</td><td>', @$row[0 .. 1]);
+           print join('</td><td>', @$row[2 .. 5]);
            print "</td></tr>\n";
        }
     }
     print '<tr><td colspan="2">', capitalize($lastrow->[0]);
-    shift @$lastrow; shift @$lastrow;
-    print "</td><td>";
-    print join('</td><td>', @$lastrow);
+    #shift @$lastrow; shift @$lastrow;
+    print '</td><td align="center">';
+    print $$lastrow[6];
+    print '</td><td>';
+    print join('</td><td>', @$lastrow[3 .. 5]);
     print "</td></tr>\n";
     print "</table>\n";
 }
@@ -615,7 +625,8 @@ 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";
     }
 }