--- loncom/interface/londocs.pm 2004/09/14 21:27:36 1.143 +++ loncom/interface/londocs.pm 2004/09/18 17:06:57 1.146 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.143 2004/09/14 21:27:36 raeburn Exp $ +# $Id: londocs.pm,v 1.146 2004/09/18 17:06:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -934,10 +934,11 @@ sub editor { $comment=~s/\/\>\;/g; $comment=~s/\:/\:/g; - $Apache::lonratedt::resources[ + if ($comment=~/\S/) { + $Apache::lonratedt::resources[ $Apache::lonratedt::order[$idx]]= - $comment.':'.join(':',@rrest); - + $comment.':'.join(':',@rrest); + } } # Store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom, @@ -1146,6 +1147,8 @@ END } elsif ($url!~/\.(sequence|page)$/) { $url='/adm/coursedocs/showdoc'.$url; } + } elsif ($url=~m|^/ext/|) { + $url='/adm/wrapper'.$url; } unless ($container eq 'page') { $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); @@ -1202,24 +1205,33 @@ ENDPARMS sub tiehash { my ($mode)=@_; $hashtied=0; + &Apache::lonnet::logthis(" tiehash1 -- $hashtied "); if ($ENV{'request.course.fn'}) { + &Apache::lonnet::logthis(" tiehash2 -- $hashtied "); if ($mode eq 'write') { + &Apache::lonnet::logthis(" tiehash3 -- $hashtied "); if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", &GDBM_WRCREAT(),0640)) { $hashtied=2; + &Apache::lonnet::logthis(" tiehash4 -- $hashtied "); } } else { + &Apache::lonnet::logthis(" tiehash5 -- $hashtied "); if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", &GDBM_READER(),0640)) { $hashtied=1; + &Apache::lonnet::logthis(" tiehash6 -- $hashtied "); } } } + &Apache::lonnet::logthis(" tiehash7 -- $hashtied "); } sub untiehash { + &Apache::lonnet::logthis(" untiehash1 -- $hashtied "); if ($hashtied) { untie %hash; } $hashtied=0; + &Apache::lonnet::logthis(" untiehash2 -- $hashtied "); } # --------------------------------------------------------------- check on this @@ -1575,14 +1587,21 @@ ENDHEADERS sub mark_hash_old { my $retie_hash=0; + &Apache::lonnet::logthis(" markold1 -- $hashtied $retie_hash "); if ($hashtied) { $retie_hash=1; + &Apache::lonnet::logthis(" markold2 -- $hashtied $retie_hash "); &untiehash(); + &Apache::lonnet::logthis(" markold3 -- $hashtied $retie_hash "); } &tiehash('write'); + &Apache::lonnet::logthis(" markold4 -- $hashtied $retie_hash "); $hash{'old'}=1; + &Apache::lonnet::logthis(" markold5 -- $hashtied $retie_hash "); &untiehash(); + &Apache::lonnet::logthis(" markold6 -- $hashtied $retie_hash "); if ($retie_hash) { &tiehash(); } + &Apache::lonnet::logthis(" markold7 -- $hashtied $retie_hash "); } sub is_hash_old {