Removed non-XML output for schedproc

diff --git a/perl/sct6 b/perl/sct6
index b2f5bff3ed7cde50eb26bd2b715268024202e7b1..f8a539a16a051fbd6f28c1db21868beea97c82a1 100755 (executable)
--- a/perl/sct6
+++ b/perl/sct6
@@ -113,7 +113,7 @@ sub next_class {
     foreach(split(" ",$class{'days'})) {
        push @days, Decode_Day_of_Week($_);
     }
-    my @off = @{$row->{'off'}};
+    my @off = @{$class{'off'}};
     for($today = ($today > $firstday ? $today : $firstday); $today < $lastday; $today++) {
        next unless(grep($_ == Day_of_Week($today->date), @days));
        next if(grep($_ == $today, @off));
@@ -333,159 +333,6 @@ return (
 );
 }
 
-sub do_mhc_schedule {
-    $| = 1;
-    my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat", U => "SU");
-    my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-    my ($file, $current, @mhc, @schedule);
-    $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
-    @schedule = get_schedule(@_);
-    @mhc = get_mhc_header;
-    if(defined($file) && (-d $file)) {
-       my @mhc2;
-       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] . " 1970 12:00:00 +0000"/e;
-           push @mhc2, $_;
-       }
-       @mhc = @mhc2;
-    }
-    foreach my $row (@schedule) {
-       #my @day = map { "!" . $_ } (off_for_holidays(%$row),off_for_exams(%$row));
-       my @day = @{$row->{'off'}};
-       map {s/\n/-/g if defined; $_} %$row;
-       my $id=generate_id($row->{'id'});
-       $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
-       $row->{'days'} =~ s/^ //;
-       #$row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
-       $current = "";
-       #print "# $id\n";
-       $current .= "X-SC-Subject: " . $row->{'title'} . "\n";
-       $current .= "X-SC-Location: " . $row->{'location'} . "\n";
-       $current .= "X-SC-Category: School\n";
-       $current .= "X-SC-Cond: " . $row->{'days'} . "\n";
-       $current .= "X-SC-Time: ".$row->{'begin'}."-".$row->{'end'}."\n";
-       $current .= "X-SC-Duration: " . $row->{'duration'} . "\n";
-       $current .= "X-SC-Day: @day\n" if(exists $day[0]);
-       $current .= "X-SC-Alarm: 15 minutes\n";
-       $current .= "X-SC-Record-Id: <".$row->{'id'}."\@from.sctweb>\n";
-       if(defined($file) && (-d $file)) {
-           #$row->{'instructor'} =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
-           my $email = get_faculty_email $row->{'instructor'};
-           $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 @date = Gmtime(Mktime($next->date,$1,$2,0));
-           $current .= sprintf "Date: %s, %2d %s %4d %02d:%02d:00 +0000\n", Day_of_Week_Abbreviation($date[7]), $date[2], $mon[$date[1]-1], $date[0], $date[3], $date[4], $date[5];
-           $current .= "Subject: " . $row->{'title'} . "\n";
-           $current .= "From: " . $row->{'instructor'} . "\n";
-       }
-       #print "\n$current";
-       push @mhc, $current;
-    }
-    if(defined($file) && (-d $file)) {
-       my @lines;
-       foreach my $name (<$file/[1-9]*>) {
-           next unless $name =~ /^$file\/[1-9][0-9]*$/;
-           open FH, $name;
-           @lines = <FH>;
-           close FH;
-           foreach (@lines) {
-               unlink $name if /^X-SC-Record-Id: <.*\@from.sctweb>/;
-           }
-       }
-       my $i=0;
-       foreach (@mhc) {
-           while(-f ++$i) {}
-           open FH, ">$file/$i" or die $!;
-           print FH $_;
-           close FH;
-       }
-    } else {
-       open(STDOUT, ">" . $file) if(defined($file));
-       print "# MHC school schedule\n# Autogenerated by sctweb ".localtime()."\n\n";
-       print join("\n", @mhc);
-    }
-}
-
-sub do_csv_schedule {
-    $| = 1;
-    my %days = (M => "Mon", T => "Tue", W => "Wed", R => "Thu", F => "Fri", S => "Sat", U => "SU");
-    my @mon = qw(Jan. Feb. Mar. Apr. May June July Aug. Sept. Oct. Nov. Dec.);
-    my (@terms, $file, $current, @mhc, @schedule);
-    $file = shift unless (!defined $_[0] or $_[0] =~ /^\d/);
-    @schedule = get_schedule(@_);
-    open(STDOUT, ">" . $file) if(defined($file));
-    foreach my $row (@schedule) {
-       map {s/\n/-/g if defined; $_} %$row;
-       my $id=generate_id($row->{'id'});
-       $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
-       $row->{'days'} =~ s/^ //;
-       #$row->{'instructor'} =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
-       my $next = next_class(%$row);
-       $current = "";
-       #print "# $id\n";
-       $current .= $row->{'id'} . ",";
-       $current .= $row->{'title'} . ",";
-       $current .= '"' . $row->{'instructor'} . '",';
-       $next =~ /^(\d\d\d\d)(\d\d)(\d\d)$/;
-       $current .= $1 . "-". $2 ."-" . $3 . "\n";
-       print $current;
-    }
-}
-
-sub do_vcalendar_schedule {
-    $| = 1;
-    my %days = (M => "MO", T => "TU", W => "WE", R => "TH", F => "FR", S => "SA", U => "SU");
-    my $file = shift if (defined $_[0] and $_[0] !~ /^\d/);
-    my @schedule = get_schedule(@_);
-    open(STDOUT, ">>" . $file) if(defined($file) && (! -d $file));
-    open(STDOUT, ">/dev/null") if(defined($file) && (-d $file));
-    print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
-    foreach my $row (@schedule) {
-       map { s/\n/-/g; $_} %$row;
-       #$row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
-       $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
-       $row->{'days'} =~ s/^ //;
-       #$row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g;
-       my @day = @{$row->{'off'}};
-       my $day = "";
-       if(exists($day[0])) {
-           $day = join(";", @day);
-           $day =~ s/\b(\d{8})\b/$1T000000/g;
-       }
-       my ($starttime, $stoptime)=($row->{'begin'}, $row->{'end'});
-       my ($startdate, $stopdate)=split(/-/, $row->{'duration'});
-       $starttime =~ s/://;
-       $stoptime =~ s/://;
-       if(defined($file) && (-d $file)) {
-           open FH, ">$file/" . $row->{'id'} . ".vcs" or die "$!";
-           select FH;
-           print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
-       }
-       print "BEGIN:VEVENT\r\n";
-       print "SUMMARY:", $row->{'title'}, "\r\n";
-       print "DESCRIPTION:", $row->{'id'}, "\r\n";
-       print "LOCATION:", $row->{'location'}, "\r\n";
-       print "CATEGORIES:Education\r\n";
-       print "DTSTART:", $startdate."T".$starttime, "00\r\n";
-       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"), ">\r\n";
-       print "END:VEVENT\r\n";
-       if(defined($file) && (-d $file)) {
-           print "END:VCALENDAR\r\n";
-           close FH;
-           select STDOUT;
-       }
-    }
-    print "END:VCALENDAR\r\n";
-}
-
 sub do_xml_schedule {
     my $file = shift if (defined $_[0] and $_[0] !~ /^\d/);
     my $schedule = { class => [ get_schedule(@_) ] };