--- loncom/homework/inputtags.pm	2001/05/19 00:23:38	1.33
+++ loncom/homework/inputtags.pm	2001/06/02 03:59:59	1.35
@@ -30,9 +30,7 @@ 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);
   push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);
   return $id;
@@ -44,16 +42,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 +62,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,12 +71,10 @@ 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.'" />';
@@ -89,50 +83,16 @@ sub start_textline {
 }
 
 sub end_textline {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   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" />';
   }