--- loncom/homework/response.pm	2001/09/14 20:15:35	1.48
+++ loncom/homework/response.pm	2002/01/07 18:03:03	1.55
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
-
+#
+# $Id: response.pm,v 1.55 2002/01/07 18:03:03 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 11/23,11/24,11/28 Gerd Kortemeyer
 # Guy Albertelli
 # 08/04,08/07 Gerd Kortemeyer
@@ -9,13 +33,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','parameter','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=();
@@ -164,6 +193,17 @@ sub check_for_previous {
   return %previous;
 }
 
+sub handle_previous {
+  my ($previous,$ad)=@_;
+  if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
+    if ($$previous{'last'}) {
+      push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
+    } else {
+      push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+    }
+  }
+}
+
 sub start_caparesponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
@@ -179,6 +219,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 +349,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;
 }
@@ -312,9 +365,20 @@ sub end_responseparam {
   return '';
 }
 
+sub start_parameter {
+  my $result = &start_responseparam(@_);
+  return $result;
+}
+
+sub end_parameter {
+  my $result = &end_responseparam(@_);
+  return $result;
+}
+
 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 +409,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 +422,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 +433,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>';