Last name first business

diff --git a/perl/sct6 b/perl/sct6
index 843f1030f03e510c119e140704e815848e387206..ffb1cbbc7031f977070430a865652f5ac98c8603 100755 (executable)
--- a/perl/sct6
+++ b/perl/sct6
@@ -298,7 +298,7 @@ sub get_faculty_email {
            chomp;
            m/"([^"]*)",([^,]*),([^,]*)/; # "
            ($name, $email, $school) = ($1, $2, $3);
-           $name =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
+           #$name =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
            $name =~ s/ [A-Z]\.//g;
            $name = lc $name;
            $name =~ s/\W//g;
@@ -364,7 +364,7 @@ sub do_mhc_schedule {
        $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/;
+           #$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}$/;
@@ -416,7 +416,7 @@ sub do_csv_schedule {
        my $id=generate_id($row->{'id'});
        $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
        $row->{'days'} =~ s/^ //;
-       $row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
+       #$row->{'instructor'} =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
        my $next = next_class(%$row);
        $current = "";
        #print "# $id\n";
@@ -439,7 +439,7 @@ sub do_vcalendar_schedule {
     print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
     foreach my $row (@schedule) {
        map { s/\n/-/g; $_} %$row;
-       $row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
+       #$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;
@@ -519,7 +519,7 @@ sub do_html_schedule {
            print '<span class="sectionid">' .$row->{'id'}. '</span><br />';
            print '<span class="coursetitle">' .$row->{'title'}. '</span></td>';
            my $instructor = $row->{'instructor'};
-           $instructor =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
+           #$instructor =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
            my $email = get_faculty_email($instructor);
            #if($email) {
                #print '<td><a href="mailto:' . $email . '">'

diff --git a/perl/sctweb b/perl/sctweb
index fc96328f3e79256617dbdbd1cb8e04a5e0e28675..b6a9a2675ae16754bf60e3d12ee12639d1c1cfbb 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -261,6 +261,7 @@ sub get_schedule {
            $classid=$1;
            $row->[2] = capitalize($row->[2]);
            $row->[2] =~ s/([A-Z]r?)$/$1./;
+           $row->[2] =~ s/^([^,]*), ([^,.]*|[^,]{4,})/$2 $1/;
            ($begin, $end) = split("-", $row->[7]);
            if($row->[7] =~ /^(\d\d):\d\d-(\d\d):\d\dPM$/) {
                if($1 < $2 && $2 != 12) {
@@ -319,6 +320,7 @@ sub get_schedule {
            $row->[2] =~ s/ *to */-/g;
            $row->[3] = capitalize($row->[3]);
            $row->[3] =~ s/([A-Z]r?)$/$1./;
+           $row->[3] =~ s/^([^,]*), ([^,.]{3}[^,]*)/$2 $1/;
            push @schedule, {
                id => $classid,
                title => $row->[0],
@@ -348,7 +350,7 @@ sub get_faculty_email {
            chomp;
            m/"([^"]*)",([^,]*),([^,]*)/; # "
            ($name, $email, $school) = ($1, $2, $3);
-           $name =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
+           #$name =~ s/^([^,]*), ([^,]*)(.*)$/$2 $1$3/;
            $name =~ s/ [A-Z]\.//g;
            $name = lc $name;
            $name =~ s/\W//g;
@@ -414,7 +416,7 @@ sub do_mhc_schedule {
        $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/;
+           #$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}$/;
@@ -466,7 +468,7 @@ sub do_csv_schedule {
        my $id=generate_id($row->{'id'});
        $row->{'days'} =~ s/([MTWRFS])/ $days{$1}/g;
        $row->{'days'} =~ s/^ //;
-       $row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
+       #$row->{'instructor'} =~ s/^([^,]*), ([^,])/$2 $1/;
        my $next = next_class(%$row);
        $current = "";
        #print "# $id\n";
@@ -489,7 +491,7 @@ sub do_vcalendar_schedule {
     print "BEGIN:VCALENDAR\r\nVERSION:1.0\r\n";
     foreach my $row (@schedule) {
        map { s/\n/-/g; $_} %$row;
-       $row->{'instructor'} =~ s/^([^,]*), ([^,]*)/$2 $1/;
+       #$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;
@@ -570,7 +572,7 @@ sub do_html_schedule {
            print '<span class="sectionid">' .$row->{'id'}. '</span><br />';
            print '<span class="coursetitle">' .$row->{'title'}. '</span></td>';
            my $instructor = $row->{'instructor'};
-           $instructor =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
+           #$instructor =~ s/^([^,]*), ([^,]*)(.*)/$2 $1$3/;
            my $email = get_faculty_email($instructor);
            #if($email) {
                #print '<td><a href="mailto:' . $email . '">'