--- loncom/homework/optionresponse.pm	2003/10/15 19:51:29	1.84.2.2
+++ loncom/homework/optionresponse.pm	2003/10/13 19:25:30	1.89
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.84.2.2 2003/10/15 19:51:29 albertel Exp $
+# $Id: optionresponse.pm,v 1.89 2003/10/13 19:25:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,14 +302,10 @@ sub displayfoils {
   my $id=$Apache::inputtags::response[-1];
   my $break;
   my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-  my $status=$Apache::inputtags::status[-1];
   if ( ($target ne 'tex') &&
        &Apache::response::show_answer() ) {
-    my $temp=1;
     foreach $name (@whichopt) {
 	my $text=$Apache::response::foilgroup{$name.'.text'};
-	my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
-	my $lastopt=$lastresponse{$name};
 	if ($text!~/^\s*$/) {
 	    if ($target eq 'tex') {
 		$break='\vskip 0 mm ';
@@ -336,12 +332,11 @@ sub displayfoils {
       }
       if ($Apache::lonhomework::type eq 'exam') {
 	if ($target ne 'tex') {
-	  $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
+	  $result.=&webbubbles(\@opt,\@alphabet);
         } else {
 	  $result.=&bubbles(\@alphabet,\@opt);
         }
       }
-      $temp++;
     }
   } else {
     my $temp=1;
@@ -378,7 +373,7 @@ sub displayfoils {
 	  }
 	  $result.=$break.$text."\n";
 	  if ($Apache::lonhomework::type eq 'exam') {
-	    $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
+	    $result.=&webbubbles(\@opt,\@alphabet,$temp);
 	  }
 	  $temp++;
       } else {
@@ -441,7 +436,7 @@ sub optionlist_correction {
 
     my $texoptionlist = shift;
     if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
-	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choose from: /;
+	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
 	$texoptionlist =~ s/<option>/\{\\bf /g;
 	$texoptionlist =~ s/<option selected="on">/\{\\bf /g;
 	$texoptionlist =~ s/<\/option>/\},/g;
@@ -459,24 +454,18 @@ sub optionlist_correction {
 
 sub webbubbles {
 
-    my ($ropt,$ralphabet,$temp,$lastopt)=@_;
+    my ($ropt,$ralphabet,$temp)=@_;
     my @opt=@$ropt; 
     my @alphabet=@$ralphabet;
     my $result='';
-    my $number_of_bubbles = $#opt + 1;
-    $result.= '<table border="1"><tr>';
-    for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
-	my $checked='';
-	if ($lastopt eq $opt[$ind]) {
-	    $checked=' checked="on" ';
+	my $number_of_bubbles = $#opt + 1;
+	$result.= '<table border="1"><tr>';
+	for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+	   $result.='<td><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp.
+                    '" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
 	}
-	$result.='<td><input type="radio" name="HWVAL_'.
-	    $Apache::inputtags::response['-1'].':'.$temp.
-	    '" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '.
-	    $opt[$ind].'</td>';
-    }
-    $result.='</tr></table>';
-    return $result;
+	$result.='</tr></table>';
+	return $result;
 }
 
 
@@ -612,7 +601,7 @@ sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
   my $result = '';
-  if ($target eq 'web' || $target eq 'tex') { 
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       $text=&Apache::lonxml::endredirection;
       if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
   }
@@ -632,11 +621,7 @@ sub end_foil {
 	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
 	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
 	} else {
-	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
-	    } else {
-		$Apache::response::conceptgroup{"$name.text"} = $text;
-	    }
+	    $Apache::response::conceptgroup{"$name.text"} = $text;
 	}
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
@@ -645,11 +630,7 @@ sub end_foil {
 	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
 	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
 	} else {
-	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
-	    } else {
-		$Apache::response::foilgroup{"$name.text"} = $text;
-	    }
+	    $Apache::response::foilgroup{"$name.text"} = $text;
 	}
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }