--- loncom/homework/response.pm	2006/12/15 22:11:43	1.156
+++ loncom/homework/response.pm	2007/04/17 23:25:09	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.156 2006/12/15 22:11:43 www Exp $
+# $Id: response.pm,v 1.162 2007/04/17 23:25:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -265,11 +265,14 @@ sub meta_response_order {
 }
 
 sub check_for_previous {
-    my ($curresponse,$partid,$id) = @_;
+    my ($curresponse,$partid,$id,$last) = @_;
     my %previous;
     $previous{'used'} = 0;
     foreach my $key (sort(keys(%Apache::lonhomework::history))) {
 	if ($key =~ /resource\.$partid\.$id\.submission$/) {
+	    if ( $last && $key =~ /^(\d+):/ ) {
+		next if ($1 >= $last);
+	    }
 	    &Apache::lonxml::debug("Trying $key");
 	    my $pastresponse=$Apache::lonhomework::history{$key};
 	    if ($pastresponse eq $curresponse) {
@@ -368,7 +371,8 @@ sub start_customresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);
     push(@Apache::lonxml::namespace,'customresponse');
     my $result;
-    undef($Apache::response::custom_answer);
+    @Apache::response::custom_answer=();
+    @Apache::response::custom_answer_type=();
     &Apache::lonxml::register('Apache::response',('answer'));
     if ($target eq 'web') {
   	if (  &Apache::response::show_answer() ) {
@@ -408,7 +412,7 @@ sub end_customresponse {
 	    &Apache::response::submitted('scantron')) {
 	    &Apache::response::scored_response($part,$id);
 	} elsif ( $response =~ /[^\s]/ && 
-		  $Apache::response::custom_answer_type eq 'loncapa/perl') {
+		  $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -420,7 +424,7 @@ sub end_customresponse {
 	    ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
 		$response;
 	    
-	    my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);
+	    my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
 	    if (!&Apache::inputtags::valid_award($award)) {
 		$error = $award;
 		$award = 'ERROR';
@@ -448,6 +452,8 @@ sub end_customresponse {
 	&Apache::lonxml::increment_counter(&Apache::response::repetition());
     }
     pop(@Apache::lonxml::namespace);
+    pop(@Apache::response::custom_answer);
+    pop(@Apache::response::custom_answer_type);
     &Apache::lonxml::deregister('Apache::response',('answer'));
     &Apache::response::end_response();
     return $result;
@@ -459,7 +465,8 @@ sub start_mathresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);
     push(@Apache::lonxml::namespace,'mathresponse');
     my $result;
-    undef($Apache::response::custom_answer);
+    @Apache::response::custom_answer=();
+    @Apache::response::custom_answer_type=();
     &Apache::lonxml::register('Apache::response',('answer'));
     if ($target eq 'web') {
   	if (  &Apache::response::show_answer() ) {
@@ -514,7 +521,7 @@ sub end_mathresponse {
 	    my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
             if ($cas eq 'maxima') {
                 my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
-                $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer,$response,$args);
+                $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
             }
 	    if (!&Apache::inputtags::valid_award($award)) {
 		$error = $award;
@@ -530,6 +537,8 @@ sub end_mathresponse {
 	}
     }
     pop(@Apache::lonxml::namespace);
+    pop(@Apache::response::custom_answer);
+    pop(@Apache::response::custom_answer_type);
     &Apache::lonxml::deregister('Apache::response',('answer'));
     &Apache::response::end_response();
     return $result;
@@ -561,15 +570,15 @@ sub implicit_multiplication {
 sub start_answer {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
-    $Apache::response::custom_answer=
-	&Apache::lonxml::get_all_text_unbalanced("/answer",$parser);
-    $Apache::response::custom_answer_type=
-	lc(&Apache::lonxml::get_param('type',$parstack,$safeeval));
-    $Apache::response::custom_answer_type =~ s/\s+//g;
+    push(@Apache::response::custom_answer,
+	&Apache::lonxml::get_all_text_unbalanced("/answer",$parser));
+    push(@Apache::response::custom_answer_type,
+	lc(&Apache::lonxml::get_param('type',$parstack,$safeeval)));
+    $Apache::response::custom_answer_type[-1] =~ s/\s+//g;
     if ($target eq "edit" ) {
 	$result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
 	$result.=&Apache::edit::editfield($token->[1],
-					  $Apache::response::custom_answer,
+					  $Apache::response::custom_answer[-1],
 					  '',80,4);
     } elsif ( $target eq "modified" ) {
 	$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);
@@ -688,7 +697,7 @@ sub setup_params {
     if ($env{'request.state'} eq 'construct') { return; }
     my %paramlist=();
     foreach my $key (keys(%Apache::lonnet::packagetab)) {
-	if ($key =~ /^$tag/) {
+	if ($key =~ /^\Q$tag\E/) {
 	    my ($package,$name) = split(/&/,$key);
 	    $paramlist{$name}=1;
 	}
@@ -1020,7 +1029,13 @@ sub submitted {
     if ($who eq 'scantron') { return 0; }
     # if the Submit Answer button for this particular part was pressed
     my $partid=$Apache::inputtags::part;
-    if (defined($env{'form.submit_'.$partid})) { return 1; }
+    if ($env{'form.submitted'} eq "part_$partid") {
+	return 1;
+    }
+    if ($env{'form.submitted'} eq "yes"
+	&& defined($env{'form.submit_'.$partid})) {
+	return 1;
+    }
     # Submit All button on a .page was pressed
     if (defined($env{'form.all_submit'})) { return 1; }
     # otherwise no submission occured
@@ -1080,6 +1095,33 @@ sub check_status {
     return 2;
 }
 
+sub setup_prior_tries_hash {
+    my ($func,$data) = @_;
+    my $part = $Apache::inputtags::part;
+    my $id   = $Apache::inputtags::response[-1];	
+    foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+	my $sub_key   = "$i:resource.$part.$id.submission";
+	next if (!exists($Apache::lonhomework::history{$sub_key}));
+	my @other_data;
+	foreach my $datum (@{ $data }) {
+	    if (ref($datum)) {
+		push(@other_data,$datum);
+	    } else {
+		my $info_key = "$i:resource.$part.$id.$datum";
+		push(@other_data,$Apache::lonhomework::history{$info_key});
+	    }
+	}
+
+	my $output =
+	    &$func('grade',
+		   $Apache::lonhomework::history{$sub_key},
+		   \@other_data);
+	if (defined($output)) {
+	    $Apache::inputtags::submission_display{$sub_key} = $output;
+	}
+    }
+}
+
 1;
 __END__