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 64c4127a8f4b40ed6cc86dc31770655b298674a2..7ca5d9f088581c03a85582a57a5cc1310dbd3e68 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -92,6 +92,7 @@ sub off_for_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);
@@ -135,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;
@@ -145,6 +146,8 @@ sub capitalize {
     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;
@@ -399,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";
@@ -448,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);