Diff for /loncom/homework/grades.pm between versions 1.259 and 1.262

version 1.259, 2005/04/07 22:44:03 version 1.262, 2005/04/08 20:12:58
Line 2109  sub processHandGrade { Line 2109  sub processHandGrade {
 #---- Save the score and award for each student, if changed  #---- Save the score and award for each student, if changed
 sub saveHandGrade {  sub saveHandGrade {
     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;      my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
     my $v_flag=0;      my @v_flag;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,      my $usec = &Apache::lonnet::getsection($domain,$stuname,
    $env{'request.course.id'});     $env{'request.course.id'});
     if (!&canmodify($usec)) { return('not_allowed'); }      if (!&canmodify($usec)) { return('not_allowed'); }
Line 2174  sub saveHandGrade { Line 2174  sub saveHandGrade {
  }   }
  # unless problem has been graded, set flag to version the submitted files   # unless problem has been graded, set flag to version the submitted files
  unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/  || $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override') {   unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/  || $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override') {
     $v_flag = 1;      push (@v_flag,$new_part);
     &Apache::lonnet::logthis("v_flag is $v_flag");  
     &Apache::lonnet::logthis('the record info is '.$record{'resource.'.$new_part.'.solved'});  
  } else {  
     &Apache::lonnet::logthis('the record info is '.$record{'resource.'.$new_part.'.solved'});  
  }   }
     }      }
     if (scalar(keys(%newrecord)) > 0) {      if (scalar(keys(%newrecord)) > 0) {
         if ($v_flag) {          if (scalar @v_flag) {
             &Apache::lonnet::logthis("v_flag (setting stuff) is $v_flag");              foreach my $part_flagged (@v_flag) {
             &Apache::lonnet::unmark_as_readonly($domain,$stuname,$symb.$env{'request.course.id'});                  &Apache::lonnet::unmark_as_readonly($domain,$stuname,$symb.$env{'request.course.id'});
             &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname);                  &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname);
               }
         }          }
  &Apache::lonnet::cstore(\%newrecord,$symb,   &Apache::lonnet::cstore(\%newrecord,$symb,
  $env{'request.course.id'},$domain,$stuname);   $env{'request.course.id'},$domain,$stuname);
Line 2204  sub version_portfiles { Line 2201  sub version_portfiles {
         #&Apache::lonnet::logthis("key is $key, value is $$record{$key}");          #&Apache::lonnet::logthis("key is $key, value is $$record{$key}");
         my $new_portfiles;          my $new_portfiles;
         if ($key =~ /^resource\.($parts)\./ && $key =~ /\.portfiles$/) {          if ($key =~ /^resource\.($parts)\./ && $key =~ /\.portfiles$/) {
               
             my @v_portfiles;              my @v_portfiles;
             my @portfiles = split(/,/,$$record{$key});              my @portfiles = split(/,/,$$record{$key});
             foreach my $file (@portfiles) {              foreach my $file (@portfiles) {
Line 2236  sub version_portfiles { Line 2232  sub version_portfiles {
                    my $copy_result = &Apache::lonnet::finishuserfileupload($stuname,$domain,$home_server,'copy',                     my $copy_result = &Apache::lonnet::finishuserfileupload($stuname,$domain,$home_server,'copy',
                                     '/portfolio'.$directory.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);                                      '/portfolio'.$directory.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);
                     push(@v_portfiles, $answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);                      push(@v_portfiles, $answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);
                     &Apache::lonnet::logthis('copy result is '.$copy_result);  
                     &Apache::lonnet::logthis('answer file is '.$answer_file.  
                         ' becomes '.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);  
                 }                  }
             }              }
             $$record{$key} = join(/,/,@v_portfiles);              $$record{$key} = join(',',@v_portfiles);
         }          }
     }       } 
     return 'ok';         return 'ok';   

Removed from v.1.259  
changed lines
  Added in v.1.262


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>