projects
/
tpope-extra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c7e3b4e
)
Fixed bugs with times and with "Staff" taught courses
author
Tim Pope
<code@tpope.net>
Wed, 24 Nov 2004 03:47:35 +0000
(
03:47
+0000)
committer
Tim Pope
<code@tpope.net>
Wed, 24 Nov 2004 03:47:35 +0000
(
03:47
+0000)
perl/sctweb
patch
|
blob
|
history
diff --git
a/perl/sctweb
b/perl/sctweb
index da7a83158810853e38173cb192e3c2530bd7b5bd..99801a8327fefee62f77d01856b2c6b61f6e820a 100755
(executable)
--- a/
perl/sctweb
+++ b/
perl/sctweb
@@
-124,9
+124,8
@@
sub off_for_exams {
} elsif($time =~ /$ending/) {
return $lastday-5;
}
} elsif($time =~ /$ending/) {
return $lastday-5;
}
- } else {
- return wantarray ? () : "";
}
}
+ return wantarray ? () : "";
}
sub capitalize {
}
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$/) {
$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;
$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'};
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);
$row->{'duration'} =~ /^(\d\d\d\d)(\d\d)(\d\d)-\d{8}$/;
$row->{'begin'} =~ /^(\d\d):(\d\d)$/;
my $next = next_class(%$row);