--- loncom/homework/optionresponse.pm	2002/03/29 19:19:21	1.35
+++ loncom/homework/optionresponse.pm	2002/06/21 20:36:30	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.35 2002/03/29 19:19:21 albertel Exp $
+# $Id: optionresponse.pm,v 1.41 2002/06/21 20:36:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@ sub start_optionresponse {
     my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
-#  if ($target eq 'tex') {$result .= '\begin{itemize}';}
+#  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
   return $result;
 }
 
@@ -74,7 +74,7 @@ sub end_optionresponse {
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-#  if ($target eq 'tex') {$result .= '\end{itemize}';}
+#  if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;
 }
 
@@ -132,7 +132,7 @@ ENDTABLE
     if ($optchanged) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
-	$option=~s/\'/\\\'/;
+	$option=~s/\'/\\\'/g;
 	&Apache::lonxml::debug("adding option :$option:");
 	$result .="'".$option."',";
       }
@@ -140,7 +140,7 @@ ENDTABLE
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
-  if ($target eq 'tex') {$result .= '\begin{itemize}';}
+  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
   return $result;
 }
 
@@ -204,7 +204,11 @@ sub end_foilgroup {
 	} elsif ($wrong==0 && $right==0) {
 	  #nothing submitted
 	} else {
-	  $ad='INCORRECT';
+	  if ($ignored==0) {
+	    $ad='INCORRECT';
+	  } else {
+	    $ad='MISSING_ANSWER';
+	  }
 	}
 	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	  $responsestr;
@@ -216,7 +220,7 @@ sub end_foilgroup {
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
   }  
-  if ($target eq 'tex') {$result .= '\end{itemize}';}
+  if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;
 }
 
@@ -225,6 +229,7 @@ sub getfoilcounts {
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+  if (&Apache::response::showallfoils()) { $max=$count; }
   return ($count,$max);
 }
 
@@ -234,7 +239,12 @@ sub whichfoils {
   my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {
     &Apache::lonxml::debug("Have $#whichopt max is $max");
-    my $aopt=int(rand($#names+1));
+    my $aopt;
+    if (&Apache::response::showallfoils()) {
+      $aopt=0;
+    } else {
+      $aopt=int(rand($#names+1));
+    }
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
@@ -303,6 +313,9 @@ sub displayfoils {
 	      $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;
 	  } else {
@@ -420,7 +433,8 @@ sub end_foil {
       &Apache::lonxml::debug("Got a name of :$name:");
       if (!$name) { $name=$Apache::lonxml::curdepth; }
       &Apache::lonxml::debug("Using a name of :$name:");
-      if ( $Apache::optionresponse::conceptgroup ) {
+      if ( $Apache::optionresponse::conceptgroup
+	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
 	$Apache::response::conceptgroup{"$name.text"} = $text;