From 779a1c2e05de06ef1a59d3abd00b7e236b6989bf Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Wed, 24 Nov 2004 03:47:35 +0000
Subject: [PATCH] Fixed bugs with times and with "Staff" taught courses

---
 perl/sctweb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/perl/sctweb b/perl/sctweb
index da7a831..99801a8 100755
--- 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 {
@@ -191,9 +190,12 @@ 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;
@@ -296,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);
-- 
2.30.2