Fixed bugs with times and with "Staff" taught courses

[tpope-extra.git] / perl / sctweb

diff --git a/perl/sctweb b/perl/sctweb
index 08bdbbc781ce9486b2ade00300f36c8b8e745563..99801a8327fefee62f77d01856b2c6b61f6e820a 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -124,9 +124,8 @@ sub off_for_exams {
        } elsif($time =~ /$ending/) {
            return $lastday-5;
        }
-    } else {
-       return wantarray ? () : "";
     }
+    return wantarray ? () : "";
 }
 
 sub capitalize {
@@ -145,6 +144,7 @@ sub capitalize {
     s/\bComp\b/Composition/g;
     s/\bFed\b/Federal/g;
     s/\bGen\b/General/g;
+    s/\bIntro\b/Introduction/g;
     #s/\bGovt\b/Government/g;
     s/\bLit\b/Literature/g;
     s/\bPrin\b/Principles/g;
@@ -190,13 +190,16 @@ sub get_schedule {
            $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->[8] =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
-           $row->[9] =~ s/ON CAMPUS\n//g;
+           $row->[9] =~ s/(ON|MAIN) CAMPUS\n//ig;
            $row->[9] =~ s/\n/ /g;
            push @schedule, {
                id => $classid,
@@ -295,7 +298,7 @@ sub do_mhc_schedule {
        if(defined($file) && (-d $file)) {
            $row->{'instructor'} =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
            my $email = get_faculty_email $row->{'instructor'};
-           $row->{'instructor'} = '"' . $row->{'instructor'} . '" <'. ($email || "$1\@from.sctweb") . ">";
+           $row->{'instructor'} = '"' . $row->{'instructor'} . '" <'. ($email || ($1 || "unknown") . "\@from.sctweb") . ">";
            $row->{'duration'} =~ /^(\d\d\d\d)(\d\d)(\d\d)-\d{8}$/;
            $row->{'begin'} =~ /^(\d\d):(\d\d)$/;
            my $next = next_class(%$row);