From 7f759722bda320b7758ca342b9bb26aa94606341 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Tue, 31 Aug 2004 16:42:21 +0000 Subject: [PATCH] New holiday scheme --- perl/sctweb | 65 ++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/perl/sctweb b/perl/sctweb index 94fc19b..487dd9c 100755 --- a/perl/sctweb +++ b/perl/sctweb @@ -9,8 +9,12 @@ use strict; use LWP::UserAgent; use HTML::TableExtract; -use Time::Local; +#use Time::Local; +use Date::Calc::Object qw(Day_of_Week Decode_Day_of_Week Delta_Days); +use Date::Calendar::Profiles qw($Profiles); +use Date::Calendar::Year; use vars qw($ua %opts); + my ($ts, $row, $response); my $url="https://sctweb.accd.edu/ia-bin4/tsrvweb.exe?WID=W&tserve_tip_read_destroy&tserve_host_code=4&tserve_tiphost_code=0"; @@ -46,40 +50,42 @@ sub generate_id { sub off_for_holidays { $_[3] =~ /(\d\d\d\d)(\d\d)(\d\d)-(\d\d\d\d)(\d\d)(\d\d)/; - my $days = (timegm(0,0,0,$6,$5-1,$4) - timegm(0,0,0,$3,$2-1,$1))/3600/24; - my @firstday = localtime timelocal(0,0,0,$3,$2-1,$1); - my $firstday = sprintf("%04d%02d%02d",($firstday[5]+1900),($firstday[4]+1),$firstday[3]); - open(HOLIDAY, "today --category=holiday --date=$firstday+$days|") or return undef; + my $days = Delta_Days($1,$2,$3,$4,$5,$6); + my $firstday = Date::Calc->new($1,$2,$3); + my $lastday = Date::Calc->new($4,$5,$6); + my $year = Date::Calendar::Year->new($1, $Profiles->{'US-TX'}); my @holidays=(); - while() { - next unless /^(\d\d)\/(\d\d) ([A-Z][a-z][a-z])/; - my $day=$1.$2; - push (@holidays, "!".($firstday[5]+1900).$day) if ($_[1] =~ /\b$3\b/); + my @days=(); + foreach(split(" ",$_[1])) { + $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, $_; + } } return wantarray ? @holidays : "@holidays"; } sub off_for_exams { $_[3] =~ /\d{8}-(\d\d\d\d)(\d\d)(\d\d)/; - my @finalday = localtime timelocal(0,0,0,$3,$2-1,$1); - return wantarray ? () : undef unless ($finalday[6] == 0); + my $lastday = Date::Calc->new($1,$2,$3); + return wantarray ? () : undef unless (Day_of_Week($lastday->date) == 7); my $beginning="(08:00-09:15|11:00-12:15|14:00-15:15|17:00-18:15|17:30-18:45|20:00-21:15|20:30-21:45)"; my $ending ="(06:30-07:45|09:30-10:45|12:30-13:45|15:30-16:45|18:30-19:45|19:00-20:15)"; - if($_[1] =~ /^Mon? We[d ]?$/) { + my $days = join(" ",map {Decode_Day_of_Week($_)} split(/ /, $_[1])); + if($days eq "1 3") { if($_[2] =~ /$beginning/) { - $_[3] =~ /\d{8}-(\d{8})/; - return "!" . ($1-4); + return $lastday-4; } elsif($_[2] =~ /$ending/) { - $_[3] =~ /\d{8}-(\d{8})/; - return "!" . ($1-6); + return $lastday-6; } - } elsif($_[1] =~ /^Tue? Th[u ]?$/i) { + } elsif($days eq "2 4") { if($_[2] =~ /$beginning/) { - $_[3] =~ /\d{8}-(\d{8})/; - return "!" . ($1-3); + return $lastday-3; } elsif($_[2] =~ /$ending/) { - $_[3] =~ /\d{8}-(\d{8})/; - return "!" . ($1-5); + return $lastday-5; } } else { return wantarray ? () : ""; @@ -191,7 +197,7 @@ EOF sub do_mhc_schedule { $| = 1; my @readheaders = ("Section ID/Title", "Days", "Time", "Start/EndDates", "Site/Building/Room"); - my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat"); + my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat", U => "SU"); my $te = new HTML::TableExtract( headers => [ @readheaders ] ); my (@terms, $row, $file); $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/); @@ -202,9 +208,10 @@ sub do_mhc_schedule { die $response->status_line unless $response->is_success; $te->parse($response->content); } + #$response = $ua->get("http://localhost/~tpope/schedule.html" ); + #$te->parse($response->content); open(STDOUT, ">>" . $file) if(defined($file)); print "# MHC school schedule\n"; - #print "# Autogenerated by sctweb ".localtime()."\n"; foreach $ts ($te->table_states) { foreach $row ($ts->rows) { map { s/\xa0//g; s/\n/-/g; $_} @$row; @@ -224,7 +231,7 @@ sub do_mhc_schedule { $row->[3] =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g; $row->[4] =~ s/ON CAMPUS-//g; $row->[4] =~ s/-/ /g; - my @day = (off_for_holidays(@$row),off_for_exams(@$row)); + my @day = map { "!" . $_ } (off_for_holidays(@$row),off_for_exams(@$row)); print "\n"; print "# $id\n"; print "X-SC-Subject: ", $row->[0], "\n"; @@ -243,8 +250,8 @@ sub do_mhc_schedule { sub do_vcalendar_schedule { $| = 1; my @readheaders = ("Section ID/Title", "Days", "Time", "Start/EndDates", "Site/Building/Room"); - my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat"); - my %daycodes = (M => "MO", T => "TU", W => "WE", R => "TH", F => "FR", S => "SA"); + #my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat"); + my %days = (M => "MO", T => "TU", W => "WE", R => "TH", F => "FR", S => "SA", U => "SU"); my $te = new HTML::TableExtract( headers => [ @readheaders ] ); my (@terms, $row, $file); $file = shift if (defined $_[0] and $_[0] !~ /^\d/); @@ -266,8 +273,6 @@ sub do_vcalendar_schedule { $row->[0] =~ s/(.*)
//g; my $classid=$1; $row->[0] = capitalize($row->[0]); - my $meets = $row->[1]; - $meets =~ s/([MTWRFS])/$daycodes{$1} /g; $row->[1] =~ s/([MTWRFS])/ $days{$1}/g; $row->[1] =~ s/^ //; if($row->[2] =~ /^(\d\d):\d\d-(\d\d):\d\dPM$/) { @@ -283,7 +288,7 @@ sub do_vcalendar_schedule { my $day = ""; if(exists($day[0])) { $day = join(";", @day); - $day =~ s/!(\d{8})/$1T000000/g; + $day =~ s/\b(\d{8})\b/$1T000000/g; } $row->[2] =~ s/://g; my ($starttime, $stoptime)=split(/-/, $row->[2]); @@ -300,7 +305,7 @@ sub do_vcalendar_schedule { print "CATEGORIES:Education\r\n"; print "DTSTART:", $startdate."T".$starttime, "00\r\n"; print "DTEND:", $startdate."T".$stoptime, "00\r\n"; - print "RRULE:W1 ", $meets.$stopdate, "T000000\r\n"; + print "RRULE:W1 ", $row->[1] . " $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})); -- 2.30.2