--- loncom/homework/response.pm	2006/12/18 21:37:47	1.158
+++ 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.158 2006/12/18 21:37:47 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) {
@@ -694,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;
 	}
@@ -1026,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
@@ -1086,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__