--- loncom/homework/response.pm	2004/06/29 22:32:14	1.100
+++ loncom/homework/response.pm	2004/10/21 03:19:04	1.107
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.100 2004/06/29 22:32:14 albertel Exp $
+# $Id: response.pm,v 1.107 2004/10/21 03:19:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,8 @@ sub start_response {
     push (@Apache::inputtags::response,$id);
     push (@Apache::inputtags::responselist,$id);
     @Apache::inputtags::inputlist=();
-    if ($Apache::inputtags::part eq '') {
+    if ($Apache::inputtags::part eq '' && 
+	!$Apache::lonhomework::ignore_response_errors) {
 	&Apache::lonxml::error(&HTML::Entities::encode(&mt("Found a <*response> outside of a <part> in a <part>ed problem"),'<>&"'));
     }
     if ($Apache::inputtags::response_with_no_part &&
@@ -267,10 +268,11 @@ sub handle_previous {
     if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
 	if ($$previous{'last'}) {
 	    push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
-	} else {
+	    push(@Apache::inputtags::previous_version,$$previous{'version'});
+	} elsif ($Apache::lonhomework::type ne 'survey') {
 	    push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+	    push(@Apache::inputtags::previous_version,$$previous{'version'});
 	}
-	push(@Apache::inputtags::previous_version,$$previous{'version'});
     }
 }
 
@@ -499,12 +501,14 @@ sub answer_footer {
 }
 
 sub showallfoils {
-    my $return=0;
-    if (defined($ENV{'form.showallfoils'}) &&
-	$ENV{'request.state'} eq 'construct') {
-	$return=1;
+    if (defined($ENV{'form.showallfoils'})) {
+	my ($symb)=&Apache::lonxml::whichuser();
+	if ($ENV{'request.state'} eq 'construct' || 
+	    ($ENV{'user.adv'} && $symb eq '')) {
+	    return 1;
+	}
     }
-    return $return;
+    return 0;
 }
 
 sub getresponse {
@@ -529,7 +533,11 @@ sub getresponse {
 	$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
 	    $response;
 	if ($resulttype ne 'letter') {
-	    $response = $let_to_num{$response};
+	    if ($resulttype eq 'A is 1') {
+		$response = $let_to_num{$response}+1;
+	    } else {
+		$response = $let_to_num{$response};
+	    }
 	}
     } else {
 	$response = $ENV{$formparm};
@@ -639,7 +647,7 @@ sub analyze_store_foilgroup {
 sub check_if_computed {
     my ($token,$parstack,$safeeval,$name)=@_;
     my $value = &Apache::lonxml::get_param($name,$parstack,$safeeval);
-    if ($value ne $token->[2]{$name}) {
+    if (ref($token->[2]) eq 'HASH' && $value ne $token->[2]{$name}) {
 	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	$Apache::lonhomework::analyze{"$part_id.answercomputed"} = 1;
     }