--- loncom/lonnet/perl/lonnet.pm 2001/11/29 21:54:56 1.179 +++ loncom/lonnet/perl/lonnet.pm 2001/12/06 19:23:42 1.184 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.179 2001/11/29 21:54:56 www Exp $ +# $Id: lonnet.pm,v 1.184 2001/12/06 19:23:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,8 +60,11 @@ # 10/2 Gerd Kortemeyer # 10/5,10/10,11/13,11/15 Scott Harrison # 11/17,11/20,11/22,11/29 Gerd Kortemeyer +# 12/5 Matthew Hall +# 12/5 Guy Albertelli +# 12/6 Gerd Kortemeyer # -# $Id: lonnet.pm,v 1.179 2001/11/29 21:54:56 www Exp $ +# $Id: lonnet.pm,v 1.184 2001/12/06 19:23:42 www Exp $ # ### @@ -169,7 +172,7 @@ use Apache::File; use LWP::UserAgent(); use HTTP::Headers; use vars -qw(%perlvar %hostname %homecache %hostip %spareid %hostdom %libserv %pr %prp %fe %fd $readit %metacache %packagetab %courselogs); +qw(%perlvar %hostname %homecache %hostip %spareid %hostdom %libserv %pr %prp %fe %fd %metacache %packagetab %courselogs %accesshash); use IO::Socket; use GDBM_File; use Apache::Constants qw(:common :http); @@ -963,7 +966,7 @@ sub tmpreset { $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', &GDBM_WRCREAT,0640)) { foreach my $key (keys %hash) { - if ($key=~ /:$symb:/) { + if ($key=~ /:$symb/) { delete($hash{$key}); } } @@ -1712,14 +1715,14 @@ sub plaintext { # ------------------------------------------------------------------ Plain Text sub fileembstyle { - my $ending=shift; + my $ending=lc(shift); return $fe{$ending}; } # ------------------------------------------------------------ Description Text sub filedescription { - my $ending=shift; + my $ending=lc(shift); return $fd{$ending}; } @@ -2606,6 +2609,11 @@ sub unescape { # ================================================================ Main Program +sub goodbye { + &flushcourselogs(); + &logthis("Shutting down"); +} + BEGIN { # ------------------------------------------------------------ Read access.conf { @@ -2691,10 +2699,11 @@ BEGIN { my $config=Apache::File->new("$perlvar{'lonTabDir'}/filetypes.tab"); while (my $configline=<$config>) { + next if ($configline =~ /^\#/); chomp($configline); my ($ending,$emb,@descr)=split(/\s+/,$configline); if ($descr[0] ne '') { - $fe{$ending}=$emb; + $fe{$ending}=lc($emb); $fd{$ending}=join(' ',@descr); } } @@ -2702,7 +2711,6 @@ BEGIN { %metacache=(); -$readit='done'; &logtouch(); &logthis('INFO: Read configuration'); }