--- loncom/homework/bridgetask.pm	2005/12/01 18:19:17	1.86
+++ loncom/homework/bridgetask.pm	2005/12/06 10:13:15	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.86 2005/12/01 18:19:17 albertel Exp $
+# $Id: bridgetask.pm,v 1.88 2005/12/06 10:13:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -381,7 +381,7 @@ INFO
 }
 
 sub start_Task {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my ($status,$accessmsg,$slot);
     if ($target ne 'webgrade') {
@@ -431,7 +431,7 @@ sub start_Task {
 	&Apache::lonxml::debug("Got $status");
 	$body_tag_start.=&add_previous_version_button($status);
 	if (!&show_task($status,$previous)) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>'.$body_tag_start;
 		if ($env{'request.state'} eq 'construct') {
@@ -552,7 +552,7 @@ DONESCREEN
 		}
 	    }
 	    $webgrade='no';
-	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	}
 	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
 	    if ($webgrade eq 'yes') {
@@ -955,6 +955,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 +983,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);
 }
 
@@ -1353,7 +1374,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)$/) {
@@ -1698,14 +1720,14 @@ sub get_instance {
 }
 
 sub start_IntroParagraph {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'web' || $target eq 'webgrade') {
 	if ($tagstack->[-2] eq 'Dimension') {
-	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
+	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	
 	} elsif ($target eq 'webgrade') {
-	    &Apache::lonxml::get_all_text('/introparagraph',$parser);
+	    &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	}
 	
     }
@@ -1734,9 +1756,9 @@ sub end_Instance {
 }
 
 sub start_InstanceText {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
+    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade') {
 	$dimension{$instance_id.'.text'}=$text;
     }
@@ -1748,9 +1770,9 @@ sub end_InstanceText {
 }
 
 sub start_Criteria {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
+    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $id=&get_id($parstack,$safeeval);
 	$dimension{$instance_id.'.criteria.'.$id}=$criteria;