--- loncom/homework/caparesponse/caparesponse.pm	2006/11/01 23:24:52	1.195
+++ loncom/homework/caparesponse/caparesponse.pm	2007/04/17 23:25:24	1.212
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.195 2006/11/01 23:24:52 albertel Exp $
+# $Id: caparesponse.pm,v 1.212 2007/04/17 23:25:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Safe::Hole;
 use Apache::lonmaxima();
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::response();
 use Storable qw(dclone);
 
 BEGIN {
@@ -40,6 +41,11 @@ BEGIN {
 }
 
 my %answer;
+my @answers;
+sub get_answer { return %answer; };
+sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) }
+sub pop_answer { %answer = %{pop(@answers)}; };
+
 my $cur_name;
 my $tag_internal_answer_name = 'INTERNAL';
 
@@ -55,19 +61,63 @@ sub start_answer {
     if (!defined($type)) { $type = 'ordered' };
     $answer{$cur_name}= { 'type' => $type,
 			  'answers' => [] };
+    if ($target eq 'edit') {
+  	$result.=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::text_arg('Name:','name',$token);
+	$result.=&Apache::edit::select_arg('Type:','type',
+					   [['ordered',  'Ordered'  ],
+					    ['unordered','Unordered'],],
+					   $token);
+	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag = &Apache::edit::get_new_args($token,$parstack,
+						       $safeeval,'name',
+						       'type');
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
+    }
     return $result;
 }
 
 sub end_answer {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
+    if ($target eq 'edit') {
+	$result .= &Apache::edit::tag_end();
+    }
+
     undef($cur_name);
     return $result;
 }
 
+sub insert_answer {
+    return '
+        <answer>
+            <value></value>
+        </answer>';
+}
+
 sub start_answergroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
+    if ($target eq 'edit') {
+  	$result.=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::select_arg('Type:','type',
+					   [['ordered',  'Ordered'  ],
+					    ['unordered','Unordered'],],
+					   $token);
+	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag = &Apache::edit::get_new_args($token,$parstack,
+						       $safeeval,'name',
+						       'type');
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
+    }
     return $result;
 }
 
@@ -82,10 +132,21 @@ sub end_answergroup {
 			    $target,$token,$tagstack,$parstack,$parser,
 			    $safeeval,-2);
 	}
+    } elsif ($target eq 'edit') {
+	$result .= &Apache::edit::tag_end();
     }
     return $result;
 }
 
+sub insert_answergroup {
+    return '
+    <answergroup>
+        <answer>
+            <value></value>
+        </answer>
+    </answergroup>';
+}
+
 sub start_value {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -98,6 +159,13 @@ sub start_value {
 	
 	push(@{ $answer{$cur_name}{'answers'} },[$bodytext]);
 	
+    } elsif ($target eq 'edit') {
+  	$result.=&Apache::edit::tag_start($target,$token);
+	my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style);
+	$result.=&Apache::edit::editline($token->[1],$bodytext,undef,40).
+	    &Apache::edit::end_row();
+    } elsif ($target eq 'modified') {
+	$result=$token->[4].&Apache::edit::modifiedfield('/value',$parser);
     }
     return $result;
 }
@@ -105,9 +173,17 @@ sub start_value {
 sub end_value {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
+    if ($target eq 'edit') {
+	$result = &Apache::edit::end_table();
+    }
     return $result;
 }
 
+sub insert_value {
+    return '
+            <value></value>';
+}
+
 sub start_vector {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -120,6 +196,13 @@ sub start_vector {
 	    @values = split(',',$values[0]);
 	}
 	push(@{ $answer{$cur_name}{'answers'} },\@values);
+    } elsif ($target eq 'edit') {
+  	$result.=&Apache::edit::tag_start($target,$token);
+	my $bodytext = &Apache::lonxml::get_all_text("/vector",$parser,$style);
+	$result.=&Apache::edit::editline($token->[1],$bodytext,undef,40).
+	    &Apache::edit::end_row();
+    } elsif ($target eq 'modified') {
+	$result=$token->[4].&Apache::edit::modifiedfield('/vector',$parser);
     }
     return $result;
 }
@@ -127,9 +210,17 @@ sub start_vector {
 sub end_vector {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
+    if ($target eq 'edit') {
+	$result = &Apache::edit::end_table();
+    }
     return $result;
 }
 
+sub insert_vector {
+    return '
+            <value></value>';
+}
+
 sub start_array {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -167,6 +258,7 @@ sub start_numericalresponse {
     &Apache::lonxml::register('Apache::caparesponse',
 			      ('answer','answergroup','value','array','unit',
 			       'vector'));
+    push(@Apache::lonxml::namespace,'caparesponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;
     undef(%answer);
@@ -231,6 +323,13 @@ sub set_answertext {
 	$response_level) = @_;
     &add_in_tag_answer($parstack,$safeeval,$response_level);
 
+    if ($name eq '' || !ref($answer{$name})) {
+	if (ref($answer{$tag_internal_answer_name})) {
+	    $name = $tag_internal_answer_name;
+	} else {
+	    $name = (sort(keys(%answer)))[0];
+	}
+    }
     return if ($name eq '' || !ref($answer{$name}));
 
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
@@ -324,11 +423,11 @@ sub check_submission {
     }
     
     if ($tag eq 'formularesponse') {
-#	if ($$args_ref{'samples'}) {
+	if ($$args_ref{'samples'}) {
 	    $$args_ref{'type'}='fml';
-#	} else {
-#	    $$args_ref{'type'}='math';
-#	}
+	} else {
+	    $$args_ref{'type'}='math';
+	}
     } elsif ($tag eq 'numericalresponse') {
 	$$args_ref{'type'}='float';
     }
@@ -372,8 +471,19 @@ sub add_in_tag_answer {
     }
 }
 
+sub capa_formula_fix {
+   my ($expression)=@_;
+   return &Apache::response::implicit_multiplication($expression);
+}
+
 sub end_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    &Apache::lonxml::deregister('Apache::caparesponse',
+			      ('answer','answergroup','value','array','unit',
+			       'vector'));
+    pop(@Apache::lonxml::namespace);
+
     my $increment=1;
     my $result = '';
     if (!$Apache::lonxml::default_homework_loaded) {
@@ -384,7 +494,6 @@ sub end_numericalresponse {
     my $tag;
     my $safehole = new Safe::Hole;
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
-    $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');
 
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::submitted() ) {
@@ -400,6 +509,7 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
 		if ( &Apache::response::submitted('scantron')) {
+		    &add_in_tag_answer($parstack,$safeeval);
 		    my ($values,$display)=&make_numerical_bubbles($partid,$id,
 						  $target,$parstack,$safeeval);
 		    $response=$values->[$response];
@@ -431,6 +541,7 @@ sub end_numericalresponse {
 	    }
 	}
     } elsif ($target eq 'web' || $target eq 'tex') {
+	&check_for_answer_errors($parstack,$safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
 	if ($Apache::lonhomework::type eq 'exam') {
@@ -490,6 +601,7 @@ sub end_numericalresponse {
 		}
 	    }
 	}
+	&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'answer' || $target eq 'analyze') {
@@ -523,6 +635,11 @@ sub end_numericalresponse {
 	}
 	foreach my $name (sort(keys(%answer))) {
 	    my @answers = @{ $answer{$name}{'answers'} };
+	    if ($target eq 'analyze') {
+		foreach my $info ('answer','ans_high','ans_low','format') {
+		    $Apache::lonhomework::analyze{"$part_id.$info"}{$name}=[];
+		}
+	    }
 	    my ($sigline,$tolline);
 	    if ($name ne $tag_internal_answer_name 
 		|| scalar(keys(%answer)) > 1) {
@@ -542,13 +659,13 @@ sub end_numericalresponse {
 		} else {
 		    @vector = ($ans);
 		}
-		if ($target eq 'answer') {
-		    my @all_answer_info;
-		    foreach my $element (@vector) {
-			my ($high,$low);
-			if ($Apache::inputtags::params{'tol'}) {
-			    ($high,$low)=&get_tolrange($element,$Apache::inputtags::params{'tol'});
-			}
+		my @all_answer_info;
+		foreach my $element (@vector) {
+		    my ($high,$low);
+		    if ($Apache::inputtags::params{'tol'}) {
+			($high,$low)=&get_tolrange($element,$Apache::inputtags::params{'tol'});
+		    }
+		    if ($target eq 'answer') {
 			if ($fmt && $tag eq 'numericalresponse') {
 			    $fmt=~s/e/E/g;
 			    if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }
@@ -572,21 +689,20 @@ sub end_numericalresponse {
 			    }
 			}
 			push(@all_answer_info,$element);
+			
+		    } elsif ($target eq 'analyze') {
+			push (@{ $Apache::lonhomework::analyze{"$part_id.answer"}{$name}[$i] }, $element);
+			if ($high) {
+			    push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"}{$name}[$i] }, $high);
+			    push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"}{$name}[$i] }, $low);
+			}
+			if ($fmt) {
+			    push (@{ $Apache::lonhomework::analyze{"$part_id.format"}{$name}[$i] }, $fmt);
+			}
 		    }
+		}
+		if ($target eq 'answer') {
 		    $result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info));
-		} elsif ($target eq 'analyze') {
-		    my ($high,$low);
-		    if ($Apache::inputtags::params{'tol'}) {
-			($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
-		    }
-		    push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);
-		    if ($high) {
-			push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
-			push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
-		    }
-		    if ($fmt) {
-			push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt);
-		    }
 		}
 	    }
 
@@ -672,10 +788,44 @@ sub end_numericalresponse {
 	$target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::increment_counter($increment);
     }
-    &Apache::response::end_response;
+    &Apache::response::end_response();
     return $result;
 }
 
+sub format_prior_response_numerical {
+    my ($mode,$answer) = @_;
+    #FIXME needs to support multianswer modes
+    return '<span class="LC_prior_numerical">'.
+	    &HTML::Entities::encode($answer,'"<>&').'</span>';
+
+}
+
+sub check_for_answer_errors {
+    my ($parstack,$safeeval) = @_;
+    &add_in_tag_answer($parstack,$safeeval);
+    my %counts;
+    foreach my $name (keys(%answer)) {
+	push(@{$counts{scalar(@{$answer{$name}{'answers'}})}},$name);
+    }
+    if (scalar(keys(%counts)) > 1) {
+	my $counts = join(' ',map {
+	    my $count = $_;
+	    &mt("Answers [_1] had [_2] components.",
+		'<tt>'.join(', ',@{$counts{$count}}).'</tt>',
+		$count);
+	} (sort(keys(%counts))));
+	&Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts);
+    }
+    use Data::Dumper;
+    &Apache::lonxml::debug("count dump is ".&Dumper(\%counts));
+    my $expected_number_of_inputs = (keys(%counts))[0];
+    if ( $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
+	&Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.", 
+				   $expected_number_of_inputs,
+				   scalar(@Apache::inputtags::inputlist)));
+    }
+}
+
 sub get_table_sizes {
     my ($number_of_bubbles,$rbubble_values)=@_;
     my $scale=2; #mm for one digit
@@ -745,7 +895,18 @@ sub make_numerical_bubbles {
 	&Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
 
     my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
-    my ($answer)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+    my $name = (exists($answer{$tag_internal_answer_name}) 
+		? $tag_internal_answer_name
+		: (sort(keys(%answer)))[0]);
+
+    if ( scalar(@{$answer{$name}{'answers'}}) > 1) {
+	&Apache::lonxml::error("Only answers with 1 component are supported in exam mode");
+    }
+    if (scalar(@{$answer{$name}{'answers'}[0]}) > 1) {
+	&Apache::lonxml::error("Vector answers are unsupported in exam mode.");
+    }
+
+    my $answer = $answer{$name}{'answers'}[0][0];
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,
 						   $safeeval);
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
@@ -858,6 +1019,12 @@ sub get_sigrange {
     return ($sig_ubound,$sig_lbound);
 }
 
+sub format_prior_response_string {
+    my ($mode,$answer) =@_;
+    return '<span class="LC_prior_string">'.
+	    &HTML::Entities::encode($answer,'"<>&').'</span>';
+}
+
 sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -978,6 +1145,7 @@ sub end_stringresponse {
 	    }
 	}
     } elsif ($target eq 'answer' || $target eq 'analyze') {
+	&add_in_tag_answer($parstack,$safeeval);
 	if ($target eq 'analyze') {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
 	    $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
@@ -988,18 +1156,25 @@ sub end_stringresponse {
 	if ($target eq 'answer') {
 	    $result.=&Apache::response::answer_header('stringresponse');
 	}
-#	foreach my $ans (@answers) {
-	    if ($target eq 'answer') {
-		$result.=&Apache::response::answer_part('stringresponse',$answer);
-		if ($type eq 're') {
+	foreach my $name (keys(%answer)) {
+	    my @answers = @{ $answer{$name}{'answers'} };
+	    for (my $i=0;$i<=$#answers;$i++) {
+		my $answer_part = $answers[$i];
+		foreach my $element (@{$answer_part}) {
+		    if ($target eq 'answer') {
+			$result.=&Apache::response::answer_part('stringresponse',
+								$element);
+		    } elsif ($target eq 'analyze') {
+			push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"}{$name}[$i] },
+			      $element);
+		    }
+		}
+		if ($target eq 'answer' && $type eq 're') {
 		    $result.=&Apache::response::answer_part('stringresponse',
 							    $answerdisplay);
 		}
-	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} },
-		      $answer);
 	    }
-#	}
+	}
 	my $string='Case Insensitive';
 	if ($type eq 'mc') {
 	    $string='Multiple Choice';
@@ -1027,6 +1202,8 @@ sub end_stringresponse {
 	}
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
+    } elsif ($target eq 'web' || $target eq 'tex') {
+	&Apache::response::setup_prior_tries_hash(\&format_prior_response_string);
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {