From: Tim Pope <code@tpope.net>
Date: Sun, 21 Aug 2005 00:20:19 +0000 (+0000)
Subject: Changes to treatment of faculty
X-Git-Url: http://git.tpope.net/?p=tpope-extra.git;a=commitdiff_plain;h=8e6151f04411ab24fbf32e2e9e6e3a11499e1d81

Changes to treatment of faculty
---

diff --git a/perl/schedproc b/perl/schedproc
index 8c45f83..b3bd248 100755
--- 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;
@@ -177,17 +175,18 @@ sub get_grades {
 }
 
 sub get_faculty_email {
-    my ($name, $school, $email);
-    if((-f ($opts{'facmail'}||"")) && ! %faculty) {
-	open INS,$opts{'facmail'} or die $!;
+    my ($name, $email, $url);
+    if((-f ($opts{'faculty'}||"")) && ! %faculty) {
+	open INS,$opts{'faculty'} or die $!;
 	while($_ = <INS>) {
 	    chomp;
 	    m/"([^"]*)",([^,]*),([^,]*)/; # "
-	    ($name, $email, $school) = ($1, $2, $3);
+	    ($name, $email, $url) = ($1, $2, $3);
 	    $name =~ s/ [A-Z]\.//g;
 	    $name = lc $name;
 	    $name =~ s/\W//g;
 	    $faculty{$name} = $email;
+	    $facurul{$name} = $urll;
 	}
     }
     $name = shift;
@@ -198,16 +197,17 @@ sub get_faculty_email {
 }
 
 sub get_faculty_url {
-    my ($name, $url);
-    if((-f ($opts{'facurl'}||"")) && ! %facurl) {
-	open INS, $opts{'facurl'} or die $!;
+    my ($name, $email, $url);
+    if((-f ($opts{'faculty'}||"")) && ! %faculty) {
+	open INS, $opts{'faculty'} or die $!;
 	while($_ = <INS>) {
 	    chomp;
-	    m/([^,]*),([^,]*)/; # "
-	    ($name, $url) = ($1, $2);
+	    m/"([^"]*)",([^,]*),([^,]*)/; # "
+	    ($name, $email, $url) = ($1, $2, $3);
 	    $name =~ s/ [A-Z]\.//g;
 	    $name = lc $name;
 	    $name =~ s/\W//g;
+	    $faculty{$name} = $email;
 	    $facurl{$name} = $url;
 	}
     }
@@ -421,10 +421,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'});