--- loncom/homework/inputtags.pm	2000/10/11 21:01:25	1.6
+++ loncom/homework/inputtags.pm	2000/11/21 18:38:46	1.7
@@ -8,8 +8,14 @@ sub BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textarea','textline','answergroup','datasubmission'));
 }
 
+
 sub initialize_inputtags {
   $Apache::inputtags::curvalue=0;
+  @Apache::inputtags::input=();
+  @Apache::inputtags::response=();
+  @Apache::inputtags::answergroup=();
+  @Apache::inputtags::part=();
+  %Apache::inputtags::params=();
 }
 
 sub start_textarea {
@@ -17,7 +23,7 @@ sub start_textarea {
   my $result = "";
   $Apache::inputtags::curvalue++;
   if ($target eq 'web') {
-    $result= '<textarea name="'.$ENV{'form.request.prefix'}.'HWVAL'.$Apache::inputtags::curvalue.'" value="">';
+    $result= '<textarea name="HWVAL'.$Apache::inputtags::curvalue.'" value="">';
   }
   return $result;
 }
@@ -36,7 +42,7 @@ sub start_textline {
   my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
   if ($size eq '') { $size=20; }
   if ($target eq 'web') {
-    $result= '<input type="text" name="'.$ENV{'form.request.prefix'}.'HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';
+    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';
   }
   return $result;
 }
@@ -47,13 +53,35 @@ sub end_textline {
 }
 
 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)=@_;
+  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' ) {
-    return '<input type="submit" name="'.$ENV{'form.request.prefix'}.'submit" value="Submit All Answers">';
+    if ( defined $ENV{'form.submit'}) {
+    }
+    if ($showbutton > 0) { $result.=$button }
   }
+  pop @Apache::inputtags::answergroup;
+  return $result;
 }
 
 
@@ -63,7 +91,7 @@ sub start_datasubmission {
 sub end_datasubmission {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {
-    return '<input type="submit" name="'.$ENV{'form.request.prefix'}.'submit" value="Submit All Data">';
+    return '<input type="submit" name="submit" value="Submit All Data">';
   }
 }