--- loncom/homework/bridgetask.pm	2005/10/04 19:32:08	1.66
+++ loncom/homework/bridgetask.pm	2005/10/12 14:45:44	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.66 2005/10/04 19:32:08 albertel Exp $
+# $Id: bridgetask.pm,v 1.69 2005/10/12 14:45:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -395,12 +395,12 @@ sub start_Task {
 		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
 		} elsif ($env{'form.donescreen'}) {
 		    my $title=&Apache::lonnet::gettitle();
-		    my $files=$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'};
-		    $result.= $head_tag_start.'</head>'.$body_tag_start;
+		    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
+		    my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
 		    $result.=<<DONESCREEN;
 <h2>$title</h2>
 <p> Files submitted: $files </p>
-<p> You are now done with the Bridge Task </p>
+<p> You are now done with this Bridge Task </p>
 <hr />
 <p> <a href="/adm/logout">Logout</a> </p>
 <p> <a href="/adm/roles">Change to a different course</a> </p>
@@ -618,10 +618,7 @@ sub end_Task {
     my ($version,$previous)=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
-	if (
-	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
-	    ($target eq 'answer') || ($target eq 'tex')
-	   ) {
+	if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	    if ($target eq 'web') {
 		if (&show_task($status,$previous)) {
 		    $result.=&Apache::lonxml::endredirection();
@@ -1089,6 +1086,8 @@ sub queue_key_locked {
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
     foreach my $key (keys(%$queuedata)) {
+	if ($key =~ /\0locked$/) { next; }
+	if ($key =~ /\0timestamp$/) { next; }
 	my ($symb,$uname,$udom)=&decode_queue_key($key);
 	if ($check_section) {
 	    my $section=&Apache::lonnet::getsection($uname,$udom);
@@ -1543,6 +1542,9 @@ sub get_instance {
 		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
 		    'pass';
 	    }
+	} else {
+	    # any other targets no output
+	    undef($result);
 	}
 	return $result;
     }