--- loncom/interface/londocs.pm 2005/11/24 16:01:04 1.214 +++ loncom/interface/londocs.pm 2006/02/10 10:16:38 1.217.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.214 2005/11/24 16:01:04 www Exp $ +# $Id: londocs.pm,v 1.217.2.1 2006/02/10 10:16:38 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1373,7 +1373,7 @@ sub process_secondary_uploads { if (($folder eq 'default') || ($folder eq 'supplemental')) { $destination .= 'default/'; } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) { - $destination .= $1.'/'; + $destination .= $2.'/'; } $destination .= $newidx; my ($url,$filename); @@ -1401,6 +1401,7 @@ sub entryline { $foldertitle; } $renametitle=~s/\"\;/\\\"/g; + $renametitle=~s/\\/\\\\/g; my $line=''; # Edit commands my $container; @@ -1555,7 +1556,7 @@ END &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); } } - $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; + $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-; if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { my $symb=&Apache::lonnet::symbclean( &Apache::lonnet::declutter('uploaded/'. @@ -1588,7 +1589,7 @@ END } } my $parameterset=' '; - if ($isfolder) { + if ($isfolder || $extension eq 'sequence') { my $foldername=&Apache::lonnet::escape($foldertitle); my $folderpath=$env{'form.folderpath'}; if ($folderpath) { $folderpath.='&' }; @@ -1666,6 +1667,7 @@ sub tiehash { sub untiehash { if ($hashtied) { untie %hash; } $hashtied=0; + return OK; } # --------------------------------------------------------------- check on this