From: Tim Pope Date: Sat, 5 Nov 2005 23:02:06 +0000 (+0000) Subject: Cleaned up code X-Git-Url: http://git.tpope.net/?p=tpope-extra.git;a=commitdiff_plain;h=c0508bd0b73d97f758bfb691f090f55f5d70910d Cleaned up code --- diff --git a/perl/schedproc b/perl/schedproc index 1c94288..f1e462c 100755 --- a/perl/schedproc +++ b/perl/schedproc @@ -82,7 +82,7 @@ undef $opts{'out'} if(($opts{'out'}||"") eq "-"); sub generate_id { my ($section, $number) = split("-", shift); my $id = 0; - foreach (split //, $section) {$id=26*$id+(ord($_)-1)%32;} + foreach my $c (split //, $section) {$id=26*$id+(ord($c)-1)%32;} $id=10000*$id+$number; return $id; } @@ -96,8 +96,8 @@ sub first_class { my $lastday = Date::Calc->new($4,$5,$6); my $today; my @days=(); - foreach(split("",$class{'days'})) { - push @days, $days{$_}; + foreach my $d (split("",$class{'days'})) { + push @days, $days{$d}; } my @off = (); @off = @{$class{'off'}} if ($class{'off'}); @@ -118,8 +118,8 @@ sub next_class { my $lastday = Date::Calc->new($4,$5,$6); my $today = Date::Calc->new(Date::Calc->localtime(time+3600*6)->date); my @days=(); - foreach(split("",$class{'days'})) { - push @days, $days{$_}; + foreach my $d(split("",$class{'days'})) { + push @days, $days{$d}; } my @off = (); @off = @{$class{'off'}} if ($class{'off'}); @@ -219,9 +219,8 @@ sub load_faculty { if(($opts{'faculty'}) && ! %faculty) { $faculty{'done'} = "true"; $content = read_fileurl($opts{'faculty'},1); - foreach $_ (split("\n", $content)) { - m/"([^"]*)",([^,]*),([^,]*)/; # " - ($name, $email, $url) = ($1, $2, $3); + foreach my $f (split("\n", $content)) { + ($name, $email, $url) = $f =~ m/"([^"]*)",([^,]*),([^,]*)/; # " next unless ($name); $name =~ s/ [A-Z]\.//g; $name = lc $name; @@ -277,10 +276,11 @@ sub do_mhc_schedule { @mhc = get_mhc_header; if(defined($file) && (-d $file)) { my @mhc2; + local $_; 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; + 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; @@ -293,7 +293,7 @@ sub do_mhc_schedule { $row->{'days'} =~ s/^ //; #$row->{'duration'} =~ s/(\d\d)-(\d\d)-(\d\d)/20$3$1$2/g; my @day = (); - @day = map { "!" . $_ } (@{$row->{'off'}}) if ($row->{'off'}); + @day = map { "!$_" } (@{$row->{'off'}}) if ($row->{'off'}); $current = ""; #print "# $id\n"; $current .= "X-SC-Subject: " . $row->{'title'} . "\n"; @@ -330,10 +330,10 @@ sub do_mhc_schedule { } } my $i=0; - foreach (@mhc) { + foreach my $h (@mhc) { while(-f ++$i) {} open (FH, ">$file/$i") || die $!; - print FH $_; + print FH $h; close FH; } } else {