--- loncom/interface/portfolio.pm	2004/09/10 17:59:13	1.41
+++ loncom/interface/portfolio.pm	2004/09/10 20:31:35	1.44
@@ -213,8 +213,7 @@ sub delete_dir_confirmed {
     } else {
         # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');
-        my @rem_dirs = ($directory_name.'/');
-        &Apache::lonhtmlcommon::remove_recent('portfolio',\@rem_dirs);
+        &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
         my @dirs = split m!/!, $directory_name;
         
 #        $directory_name =~ m/^(\/*\/)(\/*.)$/;
@@ -351,15 +350,6 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',
 					     'currentfile']);
-	# make sure there is a portfolio directory off /userfiles
-	# Fixme -- Do this in a better way -- offload it to the LOND routine
-	my @dir_list=&Apache::lonnet::dirlist('/',
-					    $ENV{'user.domain'},
-					    $ENV{'user.name'},$portfolio_root);
-	if ($dir_list[0] eq 'no_such_dir'){
-	     &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
-	     $ENV{'user.domain'},'portfolio');
-	}
 	if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
    	    $r->print('<font color="red"> No file was selected to upload.'.
    	            'To upload a file, click <strong>Browse...</strong>'.
@@ -386,15 +376,31 @@ sub handler {
 	if ($ENV{'form.currentpath'}) {
 	    $current_path = $ENV{'form.currentpath'};
 	}
-	@dir_list=&Apache::lonnet::dirlist($current_path,
+	my @dir_list=&Apache::lonnet::dirlist($current_path,
 					    $ENV{'user.domain'},
 					    $ENV{'user.name'},$portfolio_root);
-    
-	# need to know if directory is empty so it can be removed if desired
-	my $is_empty=(@dir_list == 2);
-	&display_directory($r,$current_path,$is_empty,\@dir_list);
-	$r->print("</body>\n</html>\n");
-	return OK;
+    if (@dir_list[0] eq 'no_such_dir'){
+        # two main reasons for this: 1) never been here, so directory structure not created
+        #                            2) back-button navigation after deleting a directory
+        if ($current_path eq '/'){
+	        &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
+	        $ENV{'user.domain'},'portfolio');
+        } else { # some directory that snuck in
+            # get rid of the directory from the recent pulldown, just in case
+            &Apache::lonhtmlcommon::remove_recent('portfolio',[$current_path]);
+            $current_path = '/'; # force it back to the root        
+        }
+        # now grab the directory list again, for the first time
+        @dir_list=&Apache::lonnet::dirlist($current_path,
+				    $ENV{'user.domain'},
+				    $ENV{'user.name'},$portfolio_root);
+        
+        }
+	    # need to know if directory is empty so it can be removed if desired
+	    my $is_empty=(@dir_list == 2);
+	    &display_directory($r,$current_path,$is_empty,\@dir_list);
+	    $r->print("</body>\n</html>\n");
+	    return OK;
     }
 }
 1;