--- loncom/homework/response.pm	2001/01/08 21:46:56	1.16
+++ loncom/homework/response.pm	2001/04/16 20:05:04	1.25
@@ -7,7 +7,7 @@ package Apache::response;
 use strict;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','radiobuttonresponse'));
+  &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse'));
 }
 
 sub start_response {
@@ -71,7 +71,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');
 #
@@ -88,30 +88,48 @@ 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 "";
+  return &Apache::caparesponse::start_numericalresponse($target,$token,$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 "";
+#  print "\n<br />\nsimple caparesponse\n";
+  return &Apache::caparesponse::start_caparesponse($target,$token,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_radiobuttonresponse {
   require Apache::radiobuttonresponse; 
   import Apache::radiobuttonresponse; 
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  Apache::caparesponse::start_radiobuttonresponse($target,$token,$parstack,$parser,$safeeval,$style);;
-  return "";
+  return &Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$parstack,$parser,$safeeval,$style);
+}
+
+sub start_optionresponse {
+  require Apache::optionresponse; 
+  import Apache::optionresponse; 
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::optionresponse::start_optionresponse($target,$token,$parstack,$parser,$safeeval,$style);
+}
+
+sub start_imageresponse {
+  require Apache::imageresponse; 
+  import Apache::imageresponse; 
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::imageresponse::start_imageresponse($target,$token,$parstack,$parser,$safeeval,$style);
+}
+
+sub start_essayresponse {
+  require Apache::essayresponse; 
+  import Apache::essayresponse; 
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  return &Apache::essayresponse::start_essayresponse($target,$token,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_responseparam {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'grade') {
+  if ($target eq 'grade' || $target eq 'web') {
     my $args='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $default = &Apache::run::run("{$args;".'return $default}',$safeeval);
@@ -119,8 +137,8 @@ sub start_responseparam {
     &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:");
-    if ($value eq '') {
-      &Apache::lonxml::debug("defaullting");
+    if ($value eq '' || $value eq 'con_lost') {
+      &Apache::lonxml::debug("defaulting");
       $Apache::inputtags::params{$name}=$default;
     } else {
       &Apache::lonxml::debug("using value");
@@ -138,6 +156,7 @@ sub start_responseparam {
 }
 
 sub end_responseparam {
+  return '';
 }
 
 1;