--- loncom/homework/response.pm	2001/09/14 20:15:35	1.48
+++ loncom/homework/response.pm	2001/12/04 14:53:18	1.52
@@ -9,13 +9,18 @@ package Apache::response;
 use strict;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
+  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
 }
 
 sub start_response {
   my ($parstack,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+  if ($#Apache::inputtags::import > -1) {
+    &Apache::lonxml::debug("Turning :$id: into");
+    $id = join('_',@Apache::inputtags::import).'_'.$id;
+    &Apache::lonxml::debug("New  :$id:");
+  }
   push (@Apache::inputtags::response,$id);
   push (@Apache::inputtags::responselist,$id);
   @Apache::inputtags::inputlist=();
@@ -179,6 +184,13 @@ sub start_stringresponse {
   return &Apache::caparesponse::start_stringresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
+sub start_formularesponse {
+  require Apache::caparesponse;
+  import Apache::caparesponse;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::caparesponse::start_formularesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+}
+
 sub start_numericalresponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
@@ -302,6 +314,12 @@ sub start_responseparam {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
     }
+  } elsif ($target eq 'grade') {
+    if ($ENV{'request.state'} eq 'construct') {
+      my $name    = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval);
+      $Apache::inputtags::params{$name}=$default;
+    }
   }
   return $result;
 }
@@ -315,6 +333,7 @@ sub end_responseparam {
 sub setup_params {
   my ($tag) = @_;
 
+  if ($ENV{'request.state'} eq 'construct') { return; }
   @Apache::inputtags::params=();
   my %paramlist=();
   foreach my $key (keys(%Apache::lonnet::packagetab)) {
@@ -345,12 +364,12 @@ sub setup_params {
 sub answer_header {
   my ($type) = @_;
   my $result;
-  if ($type eq 'optionresponse') {
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
     $result = '<table border="1"><tr><th>Answer for Part:'.
       $Apache::inputtags::part. '</th></tr><tr>'."\n";
   } else {
-    $result = '<table><tr><td>Answer for Part:'.$Apache::inputtags::part.
-      '</td>'."\n";
+    $result = '<table border="1"><tr><td>Answer for Part:'.
+      $Apache::inputtags::part. '</td>'."\n";
   }
   return $result;
 }
@@ -358,7 +377,7 @@ sub answer_header {
 sub answer_part {
   my ($type,$answer) = @_;
   my $result;
-  if ($type eq 'optionresponse') {
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
     $result = '<td>'.$answer.'</td>';
   } else {
     $result = '<td>'.$answer.'</td>';
@@ -369,7 +388,7 @@ sub answer_part {
 sub answer_footer {
   my ($type) = @_;
   my $result;
-  if ($type eq 'optionresponse') {
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
     $result = '</tr></table>';
   } else {
     $result = '</tr></table>';