Capitalization/Abbreviation Expansion

diff --git a/perl/sctweb b/perl/sctweb
index 49590ea07c871faf96ab177f082eed145ac8c7da..e0c8d2896ec4a914b5619dd885ed855dae27649a 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -40,8 +40,19 @@ sub capitalize {
     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/ (Of|For|The) / \l$1 /g;
-    s/\b(Ma?c)([a-z])/$1u$2/g;
+    s/ (Of|For|The|To|And|Or) / \l$1 /g;
+    s/\b(Ma?c)([a-z])/$1\u$2/g;
+    s/\b(Tcp\/Ip|Pc)\b/\U$&/g;
+    s/\bThru\b/Through/g;
+    s/\bAcct\b/Accounting/g;
+    s/\bAmer\b/American/g;
+    s/\bChem\b/Chemistry/g;
+    s/\bComp\b/Composition/g;
+    s/\bFed\b/Federal/g;
+    s/\bGen\b/General/g;
+    #s/\bGovt\b/Government/g;
+    s/\bLit\b/Literature/g;
+    s/\bPrin\b/Principles/g;
     return $_;
 }
 sub get_schedule_terms {
@@ -102,7 +113,7 @@ sub do_mhc_schedule {
 
 sub do_html_schedule {
     my @readheaders = ("Section ID/Title", "Instructor", "Days", "Time", "Start/EndDates", "Site/Building/Room");
-    my @showheaders = ("Section ID/Title", "Instructor", "Days", "Time", "Start/End\nDates", "Location");
+    my @showheaders = ("Section ID/Title", "Instructor", "Days", "Time", "Duration", "Location");
     my $te = new HTML::TableExtract( headers => [ @readheaders ] );
     my (@terms, $row);
     @terms = get_schedule_terms();
@@ -118,7 +129,8 @@ sub do_html_schedule {
        foreach $row ($ts->rows) {
            map { s/\xa0//g; s/\n/<br \/>/g; $_} @$row;
            $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
-           $row->[0] =~ s/ <BR>/<br \/>/g;
+           $row->[0] =~ s/ <BR>(.*)/"<br \/>" . capitalize($1)/eg;
+           $row->[1] = capitalize($row->[1]);
            $row->[5] =~ s/ON CAMPUS<br \/>//g;
            $row->[5] =~ s/<br \/>/ /g;
            print '<tr><td>';
@@ -148,8 +160,7 @@ sub do_html_grades {
     foreach $ts ($te->table_states) {
        foreach $row ($ts->rows) {
            map { s/\xa0//g; s/\n/<br \/>/g; $_} @$row;
-           #$row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
-           #$row->[0] =~ s/ <BR>/<br \/>/s;
+           $row->[1] = capitalize($row->[1]);
            $lastrow=$row;
            next if $row->[0] =~ /:/;
            print '<tr><td>';
@@ -157,8 +168,9 @@ sub do_html_grades {
            print "</td></tr>\n";
        }
     }
-    print '<tr><td colspan="3">', $lastrow->[0];
+    print '<tr><td colspan="2">', capitalize($lastrow->[0]);
     shift @$lastrow; shift @$lastrow;
+    print "</td><td>";
     print join('</td><td>', @$lastrow);
     print "</td></tr>\n";
     print "</table>\n";