} elsif($time =~ /$ending/) {
return $lastday-5;
}
- } else {
- return wantarray ? () : "";
}
+ return wantarray ? () : "";
}
sub capitalize {
s/\b(I)(i*)\b/$1\U$2/g;
s/\bUs\b/US/g;
s/ (And|For|Of|Or|The|To|With) / \l$1 /g;
- s/\b(Ma?c)([a-z])/$1\u$2/g;
+ s/\b(Mc)([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/\bComp\b/Composition/g;
s/\bFed\b/Federal/g;
s/\bGen\b/General/g;
+ s/\bIntro\b/Introduction/g;
+ s/\bPrgm\b/Programming/g;
+ s/\bOp Sys\b/Operating System/g;
#s/\bGovt\b/Government/g;
s/\bLit\b/Literature/g;
s/\bPrin\b/Principles/g;
$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,
foreach (@mhc) {
$_ =~ s/X-SC-Subject: ([^\n]*)/X-SC-Subject: $1\nSubject: $1/;
$_ =~ s/X-SC-Category: ([^\n]*)/X-SC-Category: $1\nFrom: $1/;
- $_ =~ s/X-SC-Duration: (\d\d\d\d)(\d\d)(\d\d)-/"X-SC-Duration: $1$2$3-\nDate: $3 " . $mon[$2-1] . " $1 12:00:00 +0000"/e;
+ $_ =~ s/X-SC-Duration: (\d\d\d\d)(\d\d)(\d\d)-/"X-SC-Duration: $1$2$3-\nDate: $3 " . $mon[$2-1] . " 1970 12:00:00 +0000"/e;
push @mhc2, $_;
}
@mhc = @mhc2;
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);
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
die $response->status_line unless $response->is_success;
- my @terms = grep {s/^<option value="([^"]*)">.*/$1/} (split( /\r\n/, $response->content));
- foreach(@_ || reverse @terms) {
+ #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); }
+ 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);