--- loncom/homework/grades.pm	2006/03/24 18:05:47	1.340
+++ loncom/homework/grades.pm	2006/03/28 18:07:24	1.344
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.340 2006/03/24 18:05:47 albertel Exp $
+# $Id: grades.pm,v 1.344 2006/03/28 18:07:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2269,7 +2269,7 @@ sub processHandGrade {
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
     my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
-    my @v_flag;
+    my @version_parts;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
 					   $env{'request.course.id'});
     if (!&canmodify($usec)) { return('not_allowed'); }
@@ -2356,15 +2356,16 @@ sub saveHandGrade {
 	        $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
 	        $dropMenu eq 'reset status')
 	   {
-	    push (@v_flag,$new_part);
+	    push (@version_parts,$new_part);
 	}
     }
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
-    if (scalar(keys(%newrecord)) > 0) {
-        if (scalar(@v_flag)) {
-            &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
+    if (%newrecord) {
+        if (@version_parts) {
+            my @changed_keys = &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts);
+	    @newrecord{@changed_keys} = @record{@changed_keys};
         }
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$env{'request.course.id'},$domain,$stuname);
@@ -2404,11 +2405,12 @@ sub handback_files {
                         ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/);
                     my ($answer_name,$answer_ver,$answer_ext) =
 		        &file_name_version_ext($answer_file);
-		    my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);
+		    $directory =~ /^.+$stuname\/portfolio(.*)/;
+		    my $portfolio_path = $1;
+		    my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
 		    my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
-		    my $new_answer = &version_selected_portfile($domain, $stuname, $directory, $answer_file, $version);
+		    my $new_answer = &version_selected_portfile($domain, $stuname, $portfolio_path, $answer_file, $version);
                     $$newrecord{"resource.$new_part.$resp_id.handback"} = $new_answer;
-
                     # set the filename to match the submitted file name
                     $env{'form.'.$newflg.'_'.$part_resp.'_returndoc1.filename'} = $env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter};
                     my $result=&Apache::lonnet::userfileupload($newflg.'_'.$part_resp.'_returndoc'.$file_counter,'',
@@ -2505,6 +2507,7 @@ sub get_last_resets {
 sub version_portfiles {
     my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
     my $version_parts = join('|',@$v_flag);
+    my @returned_keys;
     my $parts = join('|', @$parts_graded);
     my $portfolio_root = &Apache::loncommon::propath($domain,
 						 $stu_name).
@@ -2512,33 +2515,32 @@ sub version_portfiles {
     foreach my $key (keys(%$record)) {
         my $new_portfiles;
         if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
-            my @v_portfiles;
+            my @versioned_portfiles;
             my @portfiles = split(/,/,$$record{$key});
             foreach my $file (@portfiles) {
                 &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
                 my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
-                my $version = 0;
 		my ($answer_name,$answer_ver,$answer_ext) =
 		    &file_name_version_ext($answer_file);
                 my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
-                $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+                my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                 my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
                 if ($new_answer ne 'problem getting file') {
-                    push(@v_portfiles, $directory.$new_answer);
+                    push(@versioned_portfiles, $directory.$new_answer);
                     &Apache::lonnet::mark_as_readonly($domain,$stu_name,
                         ['/portfolio'.$directory.$new_answer],
                         [$symb,$env{'request.course.id'},'graded']);
                 }
-                
             }
-            $$record{$key} = join(',',@v_portfiles);
+            $$record{$key} = join(',',@versioned_portfiles);
+            push(@returned_keys,$key);
         }
     } 
-    return 'ok';   
+    return (@returned_keys);   
 }
 
 sub get_next_version {
-    my ($answer_name, $answer_ext, $dir_list);
+    my ($answer_name, $answer_ext, $dir_list) = @_;
     my $version;
     foreach my $row (@$dir_list) {
         my ($file) = split(/\&/,$row,2);