Presidents Day omission. I need a more general purpose holiday system.

[tpope-extra.git] / perl / sctweb

diff --git a/perl/sctweb b/perl/sctweb
index d9f9eff52a9ccff739a8a20fc629455ad909d61b..7ca5d9f088581c03a85582a57a5cc1310dbd3e68 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -89,10 +89,17 @@ sub off_for_holidays {
        $days[Decode_Day_of_Week($_)] = 1;
     }
     foreach ($year->search("")) {
-       next unless ($year->is_full($_) && $_>=$firstday && $_<=$lastday);
-       if (defined($days[Day_of_Week($_->date)])) {
-           push @holidays, $_;
+       my $good=1;
+       foreach my $x ($year->labels($_)) {
+           $good=0 if $x =~ /Veteran/;
+           $good=0 if $x =~ /Presidents/;
+           $good=2 if $x =~ /Thanksgiving/;
        }
+       next unless ($year->is_full($_) && $_>=$firstday && $_<=$lastday);
+       push @holidays, $_
+           if (defined($days[Day_of_Week($_->date)]) && $good);
+       push @holidays, $_+1
+           if (defined($days[5]) && $good==2);
     }
     return wantarray ? @holidays : "@holidays";
 }
@@ -118,9 +125,8 @@ sub off_for_exams {
        } elsif($time =~ /$ending/) {
            return $lastday-5;
        }
-    } else {
-       return wantarray ? () : "";
     }
+    return wantarray ? () : "";
 }
 
 sub capitalize {
@@ -130,7 +136,7 @@ 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;
@@ -139,6 +145,9 @@ sub capitalize {
     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;
@@ -178,19 +187,22 @@ sub get_schedule {
        foreach my $row ($ts->rows) {
            map { s/\xa0//g; $_} @$row;
            $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
-           $row->[0] =~ s/(.*) <BR>(.*)/capitalize($2)/eg;
+           $row->[0] =~ s/(.*) ?<[Bb][Rr][^>]*>(.*)/capitalize($2)/eg;
            $classid=$1;
            $row->[2] = capitalize($row->[2]);
            $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,
@@ -220,7 +232,7 @@ sub get_faculty_email {
        while($_ = <INS>) {
            chomp;
            m/"([^"]*)",([^,]*),([^,]*)/;
-           ($name, $school, $email) = ($1, $2, $3);
+           ($name, $email, $school) = ($1, $2, $3);
            $name =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
            $name =~ s/ [A-Z]\.//g;
            $name = lc $name;
@@ -263,7 +275,7 @@ sub do_mhc_schedule {
        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] . " 2037 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;
@@ -289,7 +301,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);
@@ -390,8 +402,8 @@ sub do_vcalendar_schedule {
        print "DTEND:", $startdate."T".$stoptime, "00\r\n";
        print "RRULE:W1 ", $row->{'days'} . " $stopdate", "T000000\r\n";
        print("EXDATE:$day\r\n") if($day);
-       print "ATTENDEE;ROLE=OWNER;STATUS=CONFIRMED:", $opts{NAME}, "\r\n" if(defined($opts{NAME}));
-       print "ATTENDEE;ROLE=ORGANIZER;STATUS=CONFIRMED:", $row->{'instructor'}, " <" . (get_faculty_email($row->{'instructor'}) || "fake\@ddress"), ">\n";
+       print "ATTENDEE;ROLE=OWNER;STATUS=CONFIRMED:", $opts{'name'}, "\r\n" if(defined($opts{'name'}));
+       print "ATTENDEE;ROLE=ORGANIZER;STATUS=CONFIRMED:", $row->{'instructor'}, " <" . (get_faculty_email($row->{'instructor'}) || "fake\@ddress"), ">\r\n";
        print "END:VEVENT\r\n";
        if(defined($file) && (-d $file)) {
            print "END:VCALENDAR\r\n";
@@ -439,8 +451,11 @@ sub do_html_grades {
     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);
@@ -480,7 +495,7 @@ sub do_faculty {
            map { s/[\r\n]//g; $_} @$row;
            $row->[0] = capitalize($row->[0]);
            $row->[0] =~ s/([A-Z]r?)$/$1./;
-           print '"'.$row->[0].'",',$row->[1].',', $row->[2], "\n";
+           print '"'.$row->[0].'",',$row->[2].',', $row->[1], "\n";
        }
     }
 }