--- loncom/homework/inputtags.pm	2001/04/23 18:01:05	1.31
+++ loncom/homework/inputtags.pm	2001/06/01 15:52:50	1.34
@@ -11,21 +11,26 @@ sub BEGIN {
 
 
 sub initialize_inputtags {
+  # list of current input ids
   @Apache::inputtags::input=();
+  # list of all input ids seen in this problem
   @Apache::inputtags::inputlist=();
+  # list of all current response ids
   @Apache::inputtags::response=();
+  #list of all response ids seen in this problem
   @Apache::inputtags::responselist=();
-  @Apache::inputtags::answergroup=();
+  # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';
+  # list of problem date statuses, the first element is for <problem> 
+  #if there is a second element it is for the current <part>
   @Apache::inputtags::status=();
+  #hash of defined params for the current response
   %Apache::inputtags::params=();
 }
 
 sub start_input {
   my ($parstack,$safeeval)=@_;
-  my $args ='';
-  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+  my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
   push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);
   return $id;
@@ -42,11 +47,9 @@ sub start_textarea {
   my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $cols = &Apache::run::run("{$args;".'return $cols}',$safeeval);
+    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
     if ( $cols eq '') { $cols = 80; }
-    my $rows = &Apache::run::run("{$args;".'return $rows}',$safeeval);
+    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
     if ( $rows eq '') { $rows = 10; }
     $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
       "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
@@ -71,9 +74,7 @@ sub start_textline {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   if ($target eq 'web') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
+    my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     if ($size eq '') { $size=20; }
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';
@@ -86,42 +87,8 @@ sub end_textline {
   return "";
 }
 
-#answergroup is deprecated
-#sub start_answergroup {
-#  my ($target,$token,$parstack,$parser,$safeeval)=@_;
-#  my $args ='';
-#  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-#  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
-#  push (@Apache::inputtags::answergroup,$id);
-#  if ($target == 'web') {
-#    
-#  }
-#  return '';
-#}
-#
-#sub end_answergroup {
-#  my ($target,$token,$parstack,$parser,$safeeval)=@_;
-#  return ''; # <answergroup> has ben deprecated
-#  my $args ='';
-#  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-#  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
-#  push (@Apache::inputtags::answergroup,$id);
-#  my $result='';
-#  my $button='<input type="submit" name="submit" value="Submit All Answers" />';
-#  my $showbutton='1';
-#  my $usedtry='1';
-#  my $response='';
-#  if ( $target == 'web' ) {
-#    if ( defined $ENV{'form.submitted'}) {
-#    }
-#    if ($showbutton > 0) { $result.=$button }
-#  }
-#  pop @Apache::inputtags::answergroup;
-#  return $result;
-#}
-
-
 sub start_datasubmission {
+  return '';
 }
 
 sub end_datasubmission {
@@ -178,10 +145,10 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-  my ($award)=@_;
+  my ($award,$solved)=@_;
   my $message='';
   my $button=0;
-  if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+  if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
     $button=0;
   } elsif ($award eq 'NO_RESPONSE') {
@@ -284,10 +251,11 @@ sub gradestatus {
   &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};
-    &Apache::lonxml::debug("Found Award |$award|");
+    my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
+    &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');
-      ($showbutton,$message) = &decideoutput($award);
+      ($showbutton,$message) = &decideoutput($award,$solved);
       $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
     }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};