Actually works

[tpope-extra.git] / perl / schedproc

diff --git a/perl/schedproc b/perl/schedproc
index 8c45f83bbd334fde796f909982f554c92be2b348..a61b4532491e20dbdf1dc0937d1f36427e575dc9 100755 (executable)
--- a/perl/schedproc
+++ b/perl/schedproc
@@ -40,7 +40,7 @@ if($arg eq "-x") {
 
 Getopt::Long::Configure ("bundling", "auto_help");
 die "Invalid arguments\n" unless
-GetOptions(\%opts, 'schedule|S=s', 'grades|G=s', 'facmail=s', 'facurl=s', 'name|n=s', 'format|f=s', 'config|F=s', 'out|o=s');
+GetOptions(\%opts, 'schedule|S=s', 'grades|G=s', 'faculty=s', 'name|n=s', 'format|f=s', 'config|F=s', 'out|o=s');
 
 if (-r $opts{'config'}) {
     open CONFIG, $opts{'config'} or die $!;
@@ -48,7 +48,7 @@ if (-r $opts{'config'}) {
        s/\#.*//;
        next unless m/^([^=]*)=(.*)/;
        my ($l, $r) = ($1, $2);
-       if ($l =~ /^(schedule|grades|name|facmail|facurl)$/) {
+       if ($l =~ /^(schedule|grades|name|faculty)$/) {
            $opts{$l}||=$r;
        } else {
            warn "Unknown config file option $l.\n";
@@ -59,13 +59,11 @@ if (-r $opts{'config'}) {
 
 $opts{'schedule'} ||= "~/schedule.xml";
 $opts{'grades'} ||= "~/grades.xml";
-$opts{'facmail'} ||= "";
-$opts{'facurl'} ||= "";
+$opts{'faculty'} ||= "";
 
 $opts{'schedule'} =~ s/(^|,)~\//$1$ENV{HOME}\//;
 $opts{'grades'} =~ s/(^|,)~\//$1$ENV{HOME}\//;
-$opts{'facmail'} =~ s/(^|,)~\//$1$ENV{HOME}\//;
-$opts{'facurl'} =~ s/(^|,)~\//$1$ENV{HOME}\//;
+$opts{'faculty'} =~ s/(^|,)~\//$1$ENV{HOME}\//;
 
 if(!defined($opts{'out'}) && defined($ARGV[0])) {
     $opts{'out'} = shift;
@@ -75,7 +73,7 @@ if(!defined($opts{'format'}) && defined($opts{'out'})) {
     $opts{'format'} = $opts{'out'};
     $opts{'format'} =~ s/.*\.//;
     $opts{'format'} =~ s/^(.*\/|)\.?schedule$/mhc/;
-    undef $opts{'out'} if($opts{'out'} =~ /^(html|mhc|csv|cvs|xml|grades)$/);
+    undef $opts{'out'} if($opts{'out'} =~ /^(html|mhc|csv|vcs|xml|grades)$/);
 }
 
 $opts{'format'} ||= "";
@@ -167,6 +165,7 @@ sub read_fileurl {
 sub get_schedule {
     my $content = read_fileurl($opts{'schedule'});
     my $ref = XMLin($content, ForceArray => [ 'class', 'off' ], KeyAttr => "");
+    die "Could not load schedule.\n" unless $ref->{'class'};
     return @{$ref->{'class'}};
 }
 
@@ -176,20 +175,26 @@ sub get_grades {
     return $ref;
 }
 
-sub get_faculty_email {
-    my ($name, $school, $email);
-    if((-f ($opts{'facmail'}||"")) && ! %faculty) {
-       open INS,$opts{'facmail'} or die $!;
-       while($_ = <INS>) {
-           chomp;
+sub load_faculty {
+    my ($name, $email, $url, $content);
+    if(($opts{'faculty'}) && ! %faculty) {
+       $content = read_fileurl($opts{'faculty'});
+       foreach $_ (split("\n", $content)) {
            m/"([^"]*)",([^,]*),([^,]*)/; # "
-           ($name, $email, $school) = ($1, $2, $3);
+           ($name, $email, $url) = ($1, $2, $3);
+           next unless ($name);
            $name =~ s/ [A-Z]\.//g;
            $name = lc $name;
            $name =~ s/\W//g;
-           $faculty{$name} = $email;
+           $faculty{$name} = $email if($email);
+           $facurl{$name} = $url if ($url);
        }
     }
+}
+
+sub get_faculty_email {
+    load_faculty();
+    my ($name);
     $name = shift;
     $name =~ s/ [A-Z]r?\.//g;
     $name = lc $name;
@@ -198,19 +203,8 @@ sub get_faculty_email {
 }
 
 sub get_faculty_url {
-    my ($name, $url);
-    if((-f ($opts{'facurl'}||"")) && ! %facurl) {
-       open INS, $opts{'facurl'} or die $!;
-       while($_ = <INS>) {
-           chomp;
-           m/([^,]*),([^,]*)/; # "
-           ($name, $url) = ($1, $2);
-           $name =~ s/ [A-Z]\.//g;
-           $name = lc $name;
-           $name =~ s/\W//g;
-           $facurl{$name} = $url;
-       }
-    }
+    load_faculty();
+    my ($name);
     $name = shift;
     $name =~ s/ [A-Z]r?\.//g;
     $name = lc $name;
@@ -421,10 +415,10 @@ sub do_html_schedule {
            #$instructor =~ s/ [A-Z. ]* / /;
            my $url = get_faculty_url($row->{'instructor'});
            if($url) {
-               print '<td><a href="' . $url . '">'
+               print '<td class="instructor"><a href="' . $url . '">'
                . $row->{'instructor'} . "</a></td>";
            } else {
-               print "<td>" . $instructor . "</td>";
+               print '<td class="instructor">' . $instructor . "</td>";
            }
            print "<td>" . $row->{'days'} . "</td>";
            my ($a,$b) = ($row->{'begin'}, $row->{'end'});