--- loncom/homework/optionresponse.pm	2002/07/16 21:02:29	1.42
+++ loncom/homework/optionresponse.pm	2002/08/05 15:55:39	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.42 2002/07/16 21:02:29 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.45 2002/08/05 15:55:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,12 +76,12 @@ sub end_optionresponse {
   return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $result='';
-  %Apache::response::foilgroup={};
+  %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   if ($target eq 'edit') {
@@ -140,10 +140,6 @@ ENDTABLE
   }
   if ($target eq 'tex') {
       $result .= ' \begin{enumerate} ';
-      my $option_list = &Apache::lonxml::get_param('options',$parstack,$safeeval);
-      $option_list =~ s/^\(//;
-      $option_list =~ s/\)$//;
-      $result .= ' \item[] Use the following options: \textbf{'.$option_list.'}. ';
   }
   return $result;
 }
@@ -277,7 +273,7 @@ sub displayfoils {
   my @falselist;
   my $result;
   my $name;
-  $Apache::optionresponse::displayoptionintex=0;
+  my $displayoptionintex=0;
   my @whichopt = &whichfoils($max);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
@@ -309,19 +305,19 @@ sub displayfoils {
 		  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
 	  $temp++;
       } else {
-	  if ($Apache::optionresponse::displayoptionintex == 0) {
-              my $durtyoptionlist = $optionlist;
-	      $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
-	      $durtyoptionlist =~ s/<option>/{\\bf /g;
-	      $durtyoptionlist =~ s/<\/option>/},/g;
-	      $durtyoptionlist =~ s/,$/\./g;
-	      $durtyoptionlist =~ s/>/\$>\$/g;
-	      $durtyoptionlist =~ s/</\$<\$/g;
-	      $durtyoptionlist =~ s/=/\$=\$/g;
-	      $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
-	      $Apache::optionresponse::displayoptionintex=1;
+	  if ($displayoptionintex == 0) {
+              my $texoptionlist = $optionlist;
+	      $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
+	      $texoptionlist =~ s/<option>/{\\bf /g;
+	      $texoptionlist =~ s/<\/option>/},/g;
+	      $texoptionlist =~ s/,$/\./g;
+	      $texoptionlist =~ s/>/\$>\$/g;
+	      $texoptionlist =~ s/</\$<\$/g;
+	      $texoptionlist =~ s/=/\$=\$/g;
+	      $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+	      $displayoptionintex=1;
 	  } else {
-	      $result.= $Apache::response::foilgroup{$name.'.text'};
+	      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
 	  }
       } 
     }
@@ -338,7 +334,7 @@ sub displayfoils {
 sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=1;
-  %Apache::response::conceptgroup={};
+  %Apache::response::conceptgroup=();
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");