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

sakharuk lon-capa-cvs@mail.lon-capa.org
Tue, 19 Aug 2003 15:24:52 -0000


sakharuk		Tue Aug 19 11:24:52 2003 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  Bug 2048 (Printing match items with concept groups) is fixed.
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.20 loncom/homework/matchresponse.pm:1.21
--- loncom/homework/matchresponse.pm:1.20	Tue Jul  1 16:13:30 2003
+++ loncom/homework/matchresponse.pm	Tue Aug 19 11:24:52 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.20 2003/07/01 20:13:30 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.21 2003/08/19 15:24:52 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,7 +102,7 @@
 						     $safeeval,'randomize',
 						     'location');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-    } elsif ($target eq 'web') {
+    } elsif ($target eq 'web' or $target eq 'tex') {
 	$Apache::matchresponse::itemtable{'location'}=
 	    &Apache::lonxml::get_param('location',$parstack,$safeeval);
     }
@@ -149,8 +149,7 @@
 	foreach my $name (@names) {
 	    $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
 	    $table.='\item['.$alphabet[$i].'] '.
-		$Apache::response::itemgroup{$name.'.text'}.
-		    ' \\\\ ';
+		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
 	}
 	$table.=' \end{description} \strut \\\\ ';
@@ -488,7 +487,7 @@
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::matchresponse::conceptgroup=0;
     my $result='';
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
 	#if not there aren't any foils to display and thus no question
 	if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
 	    my @names = @{ $Apache::response::conceptgroup{'names'} };