--- loncom/homework/response.pm	2001/01/22 19:58:09	1.20
+++ loncom/homework/response.pm	2001/06/02 03:59:59	1.28
@@ -7,14 +7,12 @@ package Apache::response;
 use strict;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','radiobuttonresponse','optionresponse'));
+  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse'));
 }
 
 sub start_response {
   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);
   if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::response,$id);
   push (@Apache::inputtags::responselist,$id);
@@ -28,6 +26,20 @@ sub end_response {
   return '';
 }
 
+# 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();
+  &Apache::lonxml::debug("randseed $rndseed");
+#  $rndseed=unpack("%32i",$rndseed);
+  $rndseed=$rndseed
+    +(&Apache::lonnet::numval($Apache::inputtags::part) << 10)
+      +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
+  srand($rndseed);
+  &Apache::lonxml::debug("randseed $rndseed");
+  return '';
+}
+
 sub meta_parameter_write {
     my ($name,$type,$default,$display)=@_;
     return '<parameter part="'.$Apache::inputtags::part.
@@ -71,7 +83,7 @@ sub mandatory_part_meta {
     &meta_stores_write('solved','string',
                           'Problem Status').
     &meta_stores_write('tries','int_zeropos',
-                          'Number of Unsuccessful Tries').
+                          'Number of Attempts').
     &meta_stores_write('awarded','float',
 		          'Partial Credit Factor');
 #
@@ -87,43 +99,51 @@ sub check_for_previous {
 sub start_numericalresponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  Apache::caparesponse::start_numericalresponse($target,$token,$parstack,$parser,$safeeval,$style);;
-  return "";
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::caparesponse::start_numericalresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_caparesponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-#  print "\n<br>\nsimple caparesponse\n";
-  Apache::caparesponse::start_caparesponse($target,$token,$parstack,$parser,$safeeval,$style);;
-  return "";
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+#  print "\n<br />\nsimple caparesponse\n";
+  return &Apache::caparesponse::start_caparesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_radiobuttonresponse {
   require Apache::radiobuttonresponse; 
   import Apache::radiobuttonresponse; 
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$parstack,$parser,$safeeval,$style);;
-  return "";
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_optionresponse {
   require Apache::optionresponse; 
   import Apache::optionresponse; 
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  Apache::optionresponse::start_optionresponse($target,$token,$parstack,$parser,$safeeval,$style);;
-  return "";
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::optionresponse::start_optionresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+}
+
+sub start_imageresponse {
+  require Apache::imageresponse; 
+  import Apache::imageresponse; 
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::imageresponse::start_imageresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+}
+
+sub start_essayresponse {
+  require Apache::essayresponse; 
+  import Apache::essayresponse; 
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_responseparam {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'grade' || $target eq 'web') {
-    my $args='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $default = &Apache::run::run("{$args;".'return $default}',$safeeval);
-    my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+    my $default= &Apache::lonxml::get_param('default',$parstack,$safeeval);
+    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
     &Apache::lonxml::debug("looking for resource.$Apache::inputtags::part.$name");
     my $value = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.$name");
     &Apache::lonxml::debug("$name has value :$value: and default :$default:");
@@ -146,6 +166,7 @@ sub start_responseparam {
 }
 
 sub end_responseparam {
+  return '';
 }
 
 1;