--- loncom/homework/bridgetask.pm	2005/04/04 18:14:58	1.9
+++ loncom/homework/bridgetask.pm	2005/04/05 15:39:41	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.9 2005/04/04 18:14:58 albertel Exp $
+# $Id: bridgetask.pm,v 1.10 2005/04/05 15:39:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,6 +188,11 @@ sub end_Task {
 	    }
 	}
 	if ($target eq 'grade') {
+	    &Apache::essayresponse::file_submission('0','bridgetask','portfiles','SUBMITTED');
+	    if ($Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
+		$Apache::lonhomework::results{"resource.0.tries"}=
+		    1+$Apache::lonhomework::history{"resource.0.tries"};
+	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
 	}
@@ -235,9 +240,8 @@ sub end_Dimension {
 	#to randomly pick one until all have been seen
 	#then start repicking
 	&Apache::response::pushrandomnumber();
-	my $num_instances=scalar(@{$dimension{'instances'}});
-	my $which=&Math::Random::random_uniform_integer(1,0,$num_instances-1);
-	my $instance=$dimension{'instances'}->[$which];
+	my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+	my $instance=$order[0];
 	$result=$dimension{'intro'}.$dimension{$instance.'.text'};
 	#FIXME: don't show the criteria yet
 	#foreach my $id (@{$dimension{$instance.'.criterias'}}) {