--- loncom/homework/inputtags.pm	2001/05/19 00:23:38	1.33
+++ loncom/homework/inputtags.pm	2001/07/13 14:02:35	1.38
@@ -30,9 +30,8 @@ sub initialize_inputtags {
 
 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);
+  if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);
   return $id;
@@ -44,16 +43,14 @@ sub end_input {
 }
 
 sub start_textarea {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   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;
@@ -66,7 +63,7 @@ sub start_textarea {
 }
 
 sub end_textarea {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {
     return "</textarea>";
   } 
@@ -75,64 +72,38 @@ sub end_textarea {
 }
 
 sub start_textline {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$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.'" />';
   }
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
+    $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
+    $result.=&Apache::edit::end_table;
+  }
+  if ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  }
   return $result;
 }
 
 sub end_textline {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if ($target eq 'edit') { return ('','no'); }
   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 {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {
     return '<input type="submit" name="submit" value="Submit All Data" />';
   }
@@ -188,9 +159,22 @@ sub decideoutput {
   my ($award,$solved)=@_;
   my $message='';
   my $button=0;
-  if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
+  if      ($solved =~ /^correct/) {
+    $message = "<b>You are correct.</b> Your receipt is ".
+      &Apache::lonnet::receipt;
+    $button=0;
+  } elsif ($solved =~ /^excused/) {
+    $message = "<b>You are excused from the problem.</b>";
     $button=0;
+  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+    if ($solved =~ /^incorrect/ || $solved eq '') {
+      $message = "Incorrect";
+      $button=1;
+    } else {
+      $message = "<b>You are correct.</b> Your receipt is ".
+	&Apache::lonnet::receipt;
+      $button=0;
+    }
   } elsif ($award eq 'NO_RESPONSE') {
     $message = '';
     $button=1;