[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm

[sakharuk]

sakharuk		Tue Jul 16 17:02:29 2002 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
  Can print both problems without answers and problems with answers.
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.41 loncom/homework/optionresponse.pm:1.42
--- loncom/homework/optionresponse.pm:1.41	Fri Jun 21 16:36:30 2002
+++ loncom/homework/optionresponse.pm	Tue Jul 16 17:02:29 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.41 2002/06/21 20:36:30 albertel Exp $
+# $Id: optionresponse.pm,v 1.42 2002/07/16 21:02:29 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,6 @@
     my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
-#  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
   return $result;
 }
 
@@ -74,7 +73,6 @@
   &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{enumerate}';}
   return $result;
 }
 
@@ -140,7 +138,13 @@
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
-  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
+  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;
 }
 
@@ -281,8 +285,6 @@
     foreach $name (@whichopt) {
       if ($target eq 'web') {
 	  $result.="<br />";
-      } elsif ($target eq 'tex') {
-	$result.='\newline';
       }
       $result .=$Apache::response::foilgroup{$name.'.value'}.
 	  ":".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -414,7 +416,6 @@
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } 
-  if ($target eq 'tex') {$result .= '\item ';}
   return $result;
 }
 
@@ -440,7 +441,11 @@
 	$Apache::response::conceptgroup{"$name.text"} = $text;	
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
-	$Apache::response::foilgroup{"$name.value"} = $value;
+        if ($target eq 'tex') {
+	    $Apache::response::foilgroup{"$name.value"} = '\item '.$value;
+	} else {
+	    $Apache::response::foilgroup{"$name.value"} = $value;
+	}
 	$Apache::response::foilgroup{"$name.text"} = $text;
       }
     }