--- loncom/homework/bridgetask.pm	2005/12/01 18:46:31	1.87
+++ loncom/homework/bridgetask.pm	2006/02/08 22:04:34	1.102
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.87 2005/12/01 18:46:31 albertel Exp $
+# $Id: bridgetask.pm,v 1.102 2006/02/08 22:04:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,21 +80,28 @@ sub proctor_check_auth {
 		}
 	    }
 	    if ($authenticated && $type eq 'Task') {
+		# increment version
 		my $version=
-		    $Apache::lonhomework::results{'resource.version'}=
-		    ++$Apache::lonhomework::history{'resource.version'};
-		$Apache::lonhomework::results{"resource.$version.checkedin"}=
-		    $user.'@'.$domain;
-		$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
-		    $slot_name;
+		    $Apache::lonhomework::history{'resource.0.version'};
+		$version++;
+
+		#clean out all current results
 		foreach my $key (keys(%Apache::lonhomework::history)) {
 		    if ($key=~/^resource\.0\./) {
 			$Apache::lonhomework::results{$key}='';
 		    }
 		}
+		
+		#setup new version and who did it
+		$Apache::lonhomework::results{'resource.0.version'}=$version;
+		$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+		    $user.'@'.$domain;
+		$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
+		    $slot_name;
+
 		return 1;
 	    } elsif ($authenticated && $type eq 'problem') {
-		&Apache::lonxml::debug("authed #slot_name");
+		&Apache::lonxml::debug("authed $slot_name");
 		$Apache::lonhomework::results{"resource.0.checkedin"}=
 		    $user.'@'.$domain;
 		$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
@@ -109,11 +116,11 @@ sub get_version {
     my ($version,$previous);
     if ($env{'form.previousversion'} && 
 	$env{'form.previousversion'} ne 'current' &&
-	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) {
 	$version=$env{'form.previousversion'};
 	$previous=1;
     } else {
-	$version=$Apache::lonhomework::history{'resource.version'};
+	$version=$Apache::lonhomework::history{'resource.0.version'};
 	$previous=0;
     }
     if (wantarray) {
@@ -125,10 +132,10 @@ sub get_version {
 sub add_previous_version_button {
     my ($status)=@_;
     my $result;
-    if ($Apache::lonhomework::history{'resource.version'} eq '') {
+    if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
 	return '';
     }
-    if ($Apache::lonhomework::history{'resource.version'} < 2 &&
+    if ($Apache::lonhomework::history{'resource.0.version'} < 2 &&
 	$status ne 'NEEDS_CHECKIN') {
 	return '';
     }
@@ -139,8 +146,8 @@ sub add_previous_version_button {
 	    "</h3>\n";
     }
     my @to_show;
-    foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
-	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
+    foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) {
+	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) {
 	    push(@to_show,$test_version);
 	}
     }
@@ -322,7 +329,7 @@ sub internal_location {
 sub submission_time_stamp {
     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $submissiontime;
-    my $version=$Apache::lonhomework::history{'resource.version'};
+    my $version=$Apache::lonhomework::history{'resource.0.version'};
     for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
 	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
 	    $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
@@ -330,7 +337,7 @@ sub submission_time_stamp {
     }
     my $result;
     if ($submissiontime) {
-	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
+	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'};
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	my $diff = $slot{'endtime'} - $submissiontime;
 	my ($color,$when)=('#FF6666','after');
@@ -426,7 +433,7 @@ sub start_Task {
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
 	my $expression='$external::datestatus="'.$status.'";';
-	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
+	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
 	$body_tag_start.=&add_previous_version_button($status);
@@ -547,6 +554,8 @@ DONESCREEN
 		    $result.=&show_queue($env{'form.queue'},1);
 		} elsif ($status_code eq 'select_user') {
 		    $result.=&select_user();
+		} elsif ($status_code eq 'unable') {
+		    $result.='<b>'.&mt("Unable to aqcuire a user to grade.").'</b>'.$back;
 		} else {
 		    $result.='<b>'.&mt("No user to be graded.").'</b>'.$back;
 		}
@@ -682,6 +691,17 @@ sub get_key_todo {
     }
     return (undef,undef)
 }
+
+sub minimize_storage {
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if ($key =~ /regrader$/) { next; }
+	if ($Apache::lonhomework::results{$key} eq
+	    $Apache::lonhomework::history{$key}) {
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -717,12 +737,12 @@ sub end_Task {
 DONEBUTTON
                 }
 		if (&show_task($status,$previous) &&
-		    $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
-		    my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
+		    $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
+		    my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
 		    my $title=&Apache::lonnet::gettitle();
 
 		    my $slot_name=
-			$Apache::lonhomework::history{"resource.$version.checkedin.slot"};
+			$Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
 		    my %slot=&Apache::lonnet::get_slot($slot_name);
 		    my $start_time=
 			&Apache::lonlocal::locallocaltime($slot{'starttime'});
@@ -747,7 +767,7 @@ DONEBUTTON
 			if ($Apache::bridgetask::dimensionmandatory{$dim_id}
 			    eq 'N') {
 			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') {
 				$opt_passed++;
 			    }
 			} else {
@@ -757,7 +777,7 @@ DONEBUTTON
 		    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
 							 $parstack,$safeeval);
 		    if ($opt_req !~ /\S/) { $opt_req='0'; }
-		    $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";
+		    $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n";
 
 		    my $internal_location=&internal_location();
 		    $result=~s/\Q$internal_location\E/$status/;
@@ -806,7 +826,7 @@ DONEBUTTON
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
 		my $status=
-		    $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
+		    $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
 		my $mandatory=
 		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
 		if ($status eq 'pass') {
@@ -825,10 +845,10 @@ DONEBUTTON
 		$mandatory_failed++;
 	    }
 	    &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
-	    $Apache::lonhomework::results{'resource.grader'}=
+	    $Apache::lonhomework::results{'resource.0.regrader'}=
 		$env{'user.name'}.'@'.$env{'user.domain'};
 	    if ($review) {
-		$Apache::lonhomework::results{"resource.$version.status"}='review';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='review';
 		if ($env{'form.queue'} eq 'reviewqueue') {
 		    &check_queue_unlock($env{'form.queue'});
 		    &Apache::lonxml::debug(" still needs review not changing status.");
@@ -836,7 +856,7 @@ DONEBUTTON
 		    &move_between_queues($env{'form.queue'},'reviewqueue');
 		}
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
 		if ($env{'form.queue'} eq 'reviewqueue' ||
 		    $env{'form.queue'} eq 'none' ) {
 		    &Apache::lonxml::debug("moving back.");
@@ -845,7 +865,7 @@ DONEBUTTON
 		    &check_queue_unlock($env{'form.queue'});
 		}
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.status"}='fail';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='fail';
 		$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
 		$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
@@ -863,7 +883,7 @@ DONEBUTTON
 						       ["$version.0.bridgetask"]);
 		}
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.status"}='pass';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='pass';
 		$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
 		$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
@@ -880,8 +900,8 @@ DONEBUTTON
 						       ["$version.0.bridgetask"]);
 		}
 	    }
-	    $Apache::lonhomework::results{"resource.status"}=
-		$Apache::lonhomework::results{"resource.$version.status"};
+	    $Apache::lonhomework::results{"resource.0.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.status"};
 	    if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
 		$Apache::lonhomework::results{"resource.0.award"}=
 		    $Apache::lonhomework::results{"resource.$version.0.award"};
@@ -890,6 +910,7 @@ DONEBUTTON
 		$Apache::lonhomework::results{"resource.0.solved"}=
 		    $Apache::lonhomework::results{"resource.$version.0.solved"};
 	    }
+	    &minimize_storage();
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
@@ -955,6 +976,25 @@ sub check_queue_unlock {
     return 'not_owner';
 }
 
+sub in_queue {
+    my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
+    if ($queue eq 'none') { return 0; }
+    if (!defined($symb) || !defined($cdom) || !defined($cnum)
+	|| !defined($udom) || !defined($uname)) {
+	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+
+    my $key=&encode_queue_key($symb,$udom,$uname);
+    my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);
+
+    if (defined($results{$key})) {
+	return 1;
+    }
+    return 0;
+}
+
 sub remove_from_queue {
     my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
     if ($queue eq 'none') { return 'ok'; }
@@ -964,9 +1004,11 @@ sub remove_from_queue {
 	$cnum=$env{'course.'.$cid.'.num'};
 	$cdom=$env{'course.'.$cid.'.domain'};
     }
+    if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
+	return 'ok';
+    }
     my $key=&encode_queue_key($symb,$udom,$uname);
     my @keys=($key,"$key\0locked");
-    &Apache::lonnet::logthis("removing @keys");
     return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
 }
 
@@ -1138,6 +1180,7 @@ sub get_queue_counts {
 	return (0,0,0);
     }
     my ($entries,$ready_to_grade,$locks)=(0,0,0);
+    my %slot_cache;
     foreach my $key (sort(keys(%queue))) {
 	if ($key=~/locked$/) {
 	    $locks++;
@@ -1147,8 +1190,11 @@ sub get_queue_counts {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    $entries++;
 	    my $slot=$queue{$key}->[0];
-	    my %slot_data=&Apache::lonnet::get_slot($slot);
-	    if (time > $slot_data{'endtime'}) {
+	    if (!exists($slot_cache{$slot})) {
+		my %slot_data=&Apache::lonnet::get_slot($slot);
+		$slot_cache{$slot} = \%slot_data;
+	    }
+	    if (time > $slot_cache{$slot}{'endtime'}) {
 		$ready_to_grade++;
 	    }
 	}
@@ -1185,6 +1231,7 @@ sub queue_key_locked {
 
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
+    my @possible; # will hold queue entries that are valid to be selected
     foreach my $key (keys(%$queuedata)) {
 	if ($key =~ /\0locked$/) { next; }
 	if ($key =~ /\0timestamp$/) { next; }
@@ -1202,11 +1249,18 @@ sub pick_from_queue_data {
 	    &Apache::lonxml::debug("not time");
 	    next;
 	}
-	if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
+	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");
 	    next;
 	}
-	return $key;
+	push(@possible,[$key,$slot_data{'endtime'}]);
+    }
+    if (@possible) {
+        # sort entries in order by slot end time
+	@possible = sort { $a->[1] <=> $b->[1] } @possible;
+	# pick one of the first ten entries
+	my $max=($#possible < 10) ? $#possible : 10;
+	return $possible[int(rand($max))][0];
     }
     return undef;
 }
@@ -1277,12 +1331,19 @@ sub get_from_queue {
     my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }
+    my $attempts=0;
     while (1) {
+	if ($attempts > 2) {
+	    # tried twice to get a queue entry, giving up
+	    return (undef,'unable');
+	}
 	my $starttime=time;
 	&Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},
 			      $cdom,$cnum);
 	&Apache::lonxml::debug("$starttime");
 	my $regexp="^$symb\0queue\0";
+	my $range= ($attempts < 1 ) ? '0-100' : '0-400';
+
 	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
 	#make a pass looking for a user _not_ in my section
 	if ($env{'request.course.sec'}) {
@@ -1295,8 +1356,7 @@ sub get_from_queue {
 	# ready for grading
 	if (!$todo) {
 	    &Apache::lonxml::debug("no sce");
-	    $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
-					\%queue,$cdom,$cnum);
+	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
 	    &Apache::lonxml::debug("no sce $todo");
 	}
 	# no user to grade 
@@ -1304,7 +1364,10 @@ sub get_from_queue {
 	&Apache::lonxml::debug("got $todo");
 	# otherwise found someone so lets try to lock them
 	# unless someone else already picked them
-	if (!&lock_key($queue,$todo)) { next; }
+	if (!&lock_key($queue,$todo)) {
+	    $attempts++;
+	    next;
+	}
 	my (undef,$endtime)=
 	    &Apache::lonnet::get($queue,["$symb\0timestamp"],
 				 $cdom,$cnum);
@@ -1323,6 +1386,7 @@ sub get_from_queue {
 		&Apache::lonnet::del($queue,["$todo\0locked"],
 				     $cdom,$cnum);
 		&Apache::lonxml::debug("del");
+		$attempts++;
 		next;
 	    }
 	}
@@ -1353,7 +1417,8 @@ sub select_user {
 	
 	my $cnum=$env{'course.'.$cid.'.num'};
 	my $cdom=$env{'course.'.$cid.'.domain'};
-	my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname);
+	my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
+					 'Task');
 	my $queue = 'none';
 	my $cannot_grade;
 	if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
@@ -1378,10 +1443,12 @@ sub select_user {
 		$seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 	    }
+	    my $studentdis = $student;
+	    $studentdis =~ tr/:/@/;
 	    $result.=<<RESULT;
 <tr>
   <td>
-    <form method="POST">
+    <form style="display: inline" method="POST">
       <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
@@ -1389,7 +1456,7 @@ sub select_user {
       <input type="submit" name="submit" value="Regrade" />
       $seclist
     </form>
-  <td>$fullname->{$student}</td>
+  <td>$fullname->{$student} <tt>($studentdis)</tt></td>
   <td>
 RESULT
         }
@@ -1409,6 +1476,9 @@ RESULT
 	if ($status{'version'}) {
 	    $result .= ' '.&mt('Version').' '.$status{'version'};
 	}
+	if ($status{'grader'}) {
+	    $result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' ';
+	}
 	$result.= '</td><td>';
 	if ($status{'reviewqueue'} eq 'enqueued') {
 	    $result .= &mt('Awaiting Review');
@@ -1439,9 +1509,9 @@ sub get_student_status {
     if ($type eq 'Task') {
 	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
 					  $udom,$uname);
-	$status{'status'}=$record{'resource.status'};
-	$status{'version'}=$record{'resource.version'};
-	$status{'grader'}=$record{'resource.grader'};
+	$status{'status'}=$record{'resource.0.status'};
+	$status{'version'}=$record{'resource.0.version'};
+	$status{'grader'}=$record{'resource.0.regrader'};
     }
     $status{'reviewqueue'}=
 	&check_queue_for_key($cdom,$cnum,'reviewqueue',
@@ -1548,10 +1618,10 @@ sub get_instance {
 	    foreach my $instance (@instances) {
 		@Apache::scripttag::parser_env = @_;
 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-		if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
-		    $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+		if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
+		    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
 
-		    my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
+		    my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
 		    my $mandatory='Mandatory';
 		    if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
 			$mandatory='Optional';
@@ -1571,12 +1641,12 @@ sub get_instance {
 			if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
 			    eq 'N') {
 			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
 				$opt_passed++;
 			    }
 			} else {
 			    $man_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
 				$man_passed++;
 			    }
 			}
@@ -1590,8 +1660,8 @@ sub get_instance {
 		    $result=~s/\Q$internal_location\E/$dim_info/;
 
 		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-			my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
-			my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
+			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
 			my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 			if ($mandatory) {
 			    $mandatory='Mandatory';
@@ -1611,8 +1681,8 @@ sub get_instance {
 			@Apache::scripttag::parser_env = @_;
 			$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
 			$result.='</p><p class="grade">'.$status_display.'</p>';
-			if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
-			    $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
+			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
+			    $result.='<p class="comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
 			}
 			$result.='</div>';
 		    }
@@ -1626,7 +1696,7 @@ sub get_instance {
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 		my $link='criteria_'.$instance.'_'.$id;
-		my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
+		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
 		$result.='<tr><td width="100%" valign="top">'.
 		    '<a name="'.$link.'" />'.
 		    '<a name="next_'.$last_link.'" />'.
@@ -1637,7 +1707,7 @@ sub get_instance {
 		    #$dimension{$instance.'.criteria.'.$id}.
 		    '</td>'.
 		    '<td><nobr>Additional Comment for Student</nobr> <br />'.
-		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
+		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'.
 		    '</td>'.
 		    '<td>'.
 		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
@@ -1657,8 +1727,8 @@ sub get_instance {
 	    my $ungraded=0;
 	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
-		$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
+		$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
 		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }
@@ -1677,16 +1747,16 @@ sub get_instance {
 	    }
 	    &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
 	    if ($review) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'review';
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'ungraded';
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'fail';
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'pass';
 	    }
 	} else {