--- loncom/lonnet/perl/lonnet.pm 2002/05/07 19:16:15 1.213 +++ loncom/lonnet/perl/lonnet.pm 2002/05/08 15:21:04 1.215 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.213 2002/05/07 19:16:15 www Exp $ +# $Id: lonnet.pm,v 1.215 2002/05/08 15:21:04 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -627,6 +627,7 @@ sub subscribe { sub repcopy { my $filename=shift; $filename=~s/\/+/\//g; + if ($filename=~/^\/home\/httpd\/html\/adm\//) { return OK; } my $transname="$filename.in.transfer"; if ((-e $filename) || (-e $transname)) { return OK; } my $remoteurl=subscribe($filename); @@ -716,7 +717,6 @@ sub flushcourselogs { &logthis('Flushing course log buffers'); foreach (keys %courselogs) { my $crsid=$_; - &logthis(":$crsid:$coursehombuf{$crsid}"); if (&reply('log:'.$coursedombuf{$crsid}.':'. &escape($courselogs{$crsid}), $coursehombuf{$crsid}) eq 'ok') { @@ -2525,11 +2525,15 @@ sub symbverify { my ($symb,$thisfn)=@_; $thisfn=&declutter($thisfn); -# &logthis("Symb verify: $symb $thisfn"); + &logthis("Symb verify: $symb $thisfn"); +# direct jump to resource in page or to a sequence - will construct own symbs + if ($thisfn=~/\.(page|sequence)$/) { return 1; } +# check URL part my ($map,$resid,$url)=split(/\_\_\_/,$symb); unless (&symbclean($url) eq &symbclean($thisfn)) { return 0; } +# FIXME: done for now return 1; my %bighash; @@ -2547,15 +2551,12 @@ sub symbverify { sub symbclean { my $symb=shift; -# &logthis("Symb in: $symb"); - # remove version from map $symb=~s/\.(\d+)\.(\w+)\_\_\_/\.$2\_\_\_/; + # remove version from URL $symb=~s/\.(\d+)\.(\w+)$/\.$2/; -# &logthis("Symb out: $symb"); - return $symb; }