--- loncom/homework/response.pm	2001/08/20 23:48:05	1.46
+++ loncom/homework/response.pm	2001/11/12 20:27:28	1.51
@@ -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=();
@@ -44,7 +49,13 @@ sub end_hintresponse {
 # used by response to set the non-safe space random number generator to something
 # that is stable and unique based on the part number and response number
 sub setrandomnumber {
-  my $rndseed=&Apache::lonnet::rndseed();
+  my $rndseed;
+  if ($ENV{'request.state'} eq "construct") {
+    $rndseed=$ENV{'form.rndseed'};
+    if (!$rndseed) { $rndseed=time; }
+  } else {
+    $rndseed=&Apache::lonnet::rndseed();
+  }
   &Apache::lonxml::debug("randseed $rndseed");
 #  $rndseed=unpack("%32i",$rndseed);
   $rndseed=$rndseed
@@ -173,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; 
@@ -210,7 +228,7 @@ sub start_essayresponse {
 }
 
 sub view_or_modify {
-  my ($symb,$courseid,$domain,$name) = &Apache::lonhomework::whichuser();
+  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
   my $myself=0;
   if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) {
     $myself=1;
@@ -244,7 +262,7 @@ sub end_dataresponse {
   if ( $target eq 'web' ) {
   } elsif ($target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {
-      my ($symb,$courseid,$domain,$name)=&Apache::lonhomework::whichuser();
+      my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
       my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
       if ($allowed) {
 	&Apache::response::setup_params('datasubmission');
@@ -336,6 +354,41 @@ sub setup_params {
   }
 }
 
+sub answer_header {
+  my ($type) = @_;
+  my $result;
+  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 border="1"><tr><td>Answer for Part:'.
+      $Apache::inputtags::part. '</td>'."\n";
+  }
+  return $result;
+}
+
+sub answer_part {
+  my ($type,$answer) = @_;
+  my $result;
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+    $result = '<td>'.$answer.'</td>';
+  } else {
+    $result = '<td>'.$answer.'</td>';
+  }
+  return $result;
+}
+
+sub answer_footer {
+  my ($type) = @_;
+  my $result;
+  if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+    $result = '</tr></table>';
+  } else {
+    $result = '</tr></table>';
+  }
+  return $result;
+}
+
 1;
 __END__