--- loncom/lonnet/perl/lonnet.pm 2001/11/29 18:54:16 1.178 +++ loncom/lonnet/perl/lonnet.pm 2001/12/04 15:19:11 1.180 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.178 2001/11/29 18:54:16 www Exp $ +# $Id: lonnet.pm,v 1.180 2001/12/04 15:19:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,9 +59,9 @@ # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26, # 10/2 Gerd Kortemeyer # 10/5,10/10,11/13,11/15 Scott Harrison -# 11/17,11/20,11/22 Gerd Kortemeyer +# 11/17,11/20,11/22,11/29 Gerd Kortemeyer # -# $Id: lonnet.pm,v 1.178 2001/11/29 18:54:16 www Exp $ +# $Id: lonnet.pm,v 1.180 2001/12/04 15:19:11 albertel Exp $ # ### @@ -963,7 +963,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}); } } @@ -2409,6 +2409,7 @@ sub symblist { sub symbread { my $thisfn=shift; unless ($thisfn) { + if ($ENV{'request.symb'}) { return $ENV{'request.symb'}; } $thisfn=$ENV{'request.filename'}; } $thisfn=declutter($thisfn); @@ -2605,8 +2606,7 @@ sub unescape { # ================================================================ Main Program -sub BEGIN { -unless ($readit) { +BEGIN { # ------------------------------------------------------------ Read access.conf { my $config=Apache::File->new("/etc/httpd/conf/access.conf"); @@ -2706,5 +2706,5 @@ $readit='done'; &logtouch(); &logthis('INFO: Read configuration'); } -} + 1;