--- loncom/interface/londocs.pm	2005/06/08 17:42:01	1.178
+++ loncom/interface/londocs.pm	2005/06/08 19:36:54	1.180
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.178 2005/06/08 17:42:01 www Exp $
+# $Id: londocs.pm,v 1.180 2005/06/08 19:36:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1020,7 +1020,7 @@ sub editor {
 		if ($url=~/^http\:\/\//) { $ext='true'; }
 		$url=~s/\:/\:/g;
 # Now insert the URL at the bottom
-                my $newidx=1+$#Apache::lonratedt::resources;
+                my $newidx=&Apache::lonratedt::getresidx($url);
 		$Apache::lonratedt::resources[$newidx]=
 		    $title.':'.$url.':'.$ext.':normal:res';
 		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
@@ -1036,10 +1036,17 @@ sub editor {
            if (($env{'form.uploaddoc.filename'}) &&
                ($env{'form.cmd'}=~/^upload_(\w+)/)) {
 	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
+            	my $destination = 'docs/';
+            	if ($folder eq 'default') {
+            	    $destination .= 'default/';
+                } elsif ($folder =~ /^default_(\d+)$/) {
+                    $destination .=  $1.'/';
+                }
 # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"
               my $newidx=$#Apache::lonratedt::resources+1;
-	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);
+              $destination .= $newidx;
+	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination);
               my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\:/g;
@@ -1070,6 +1077,7 @@ sub editor {
 		    if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
 			&Apache::lonnet::removeuploadedurl($url);
 		    }
+		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];
@@ -1077,6 +1085,7 @@ sub editor {
                     $#Apache::lonratedt::order--;
                 } elsif ($cmd eq 'cut') {
 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
+		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];