Fixed for changes to server side implementation

[tpope-extra.git] / perl / sctweb

diff --git a/perl/sctweb b/perl/sctweb
index d9f9eff52a9ccff739a8a20fc629455ad909d61b..e9d76b994001765b988cc0baed7c69b90b2d5e8a 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -178,7 +178,7 @@ 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./;
@@ -220,7 +220,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 +263,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] . " $1 12:00:00 +0000"/e;
            push @mhc2, $_;
        }
        @mhc = @mhc2;
@@ -480,7 +480,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";
        }
     }
 }