--- loncom/homework/caparesponse/caparesponse.pm	2006/12/15 22:11:43	1.202
+++ loncom/homework/caparesponse/caparesponse.pm	2007/02/18 02:03:18	1.208
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.202 2006/12/15 22:11:43 www Exp $
+# $Id: caparesponse.pm,v 1.208 2007/02/18 02:03:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,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';
 
@@ -56,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;
 }
 
@@ -83,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;
@@ -99,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;
 }
@@ -106,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;
@@ -121,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;
 }
@@ -128,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;
@@ -168,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);
@@ -232,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,
@@ -380,6 +478,12 @@ sub capa_formula_fix {
 
 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) {
@@ -390,9 +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');
-    $safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,'&maxima_cas_formula_fix');
-    $safehole->wrap(\&capa_formula_fix,$safeeval,'&capa_formula_fix');
 
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::submitted() ) {
@@ -408,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];