--- loncom/homework/response.pm	2001/08/07 12:24:53	1.40
+++ loncom/homework/response.pm	2001/08/09 15:39:56	1.43
@@ -13,7 +13,7 @@ sub BEGIN {
 }
 
 sub start_response {
-  my ($parstack,$safeeval)=@_;  
+  my ($parstack,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::response,$id);
@@ -28,6 +28,19 @@ sub end_response {
   return '';
 }
 
+sub start_hintresponse {
+  my ($parstack,$safeeval)=@_;
+  my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+  if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+  push (@Apache::inputtags::response,$id);
+  return $id;
+}
+
+sub end_hintresponse {
+  pop @Apache::inputtags::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 {
@@ -47,30 +60,43 @@ sub setrandomnumber {
 
 sub meta_parameter_write {
     my ($name,$type,$default,$display)=@_;
-    return '<parameter part="'.$Apache::inputtags::part.
-	            '" name="'.$name.
-                    '" type="'.$type.'"'.
- ($default?' default="'.$default.'"':'').
- ($display?' display="'.$display.' [Part: '.$Apache::inputtags::part.']"':'')
-           .'></parameter>'
-     ."\n";
+    my $partref=$Apache::inputtags::part;
+    my $result='<parameter part="'.$Apache::inputtags::part.'"';
+    if (defined($Apache::inputtags::response[-1])) {
+      $result.=            ' id="'.$Apache::inputtags::response[-1].'"';
+      $partref.='_'.$Apache::inputtags::response[-1];
+    }
+    $result.=            ' name="'.$name.'"'.
+                         ' type="'.$type.'"'.
+($default?' default="'.$default.'"':'').
+($display?' display="'.$display.' [Part: '.$partref.']"':'')
+             .'></parameter>'
+             ."\n";
+    return $result;
 }
 
 sub meta_package_write {
     my $name=shift;
-    return '<parameter part="'.$Apache::inputtags::part.
-	         '" package="'.$name.'"></parameter>'
-     ."\n";
+    my $result = '<parameter part="'.$Apache::inputtags::part.'"';
+    if(defined($Apache::inputtags::response[-1])) {
+      $result.=              ' id="'.$Apache::inputtags::response[-1].'"';
+    }
+    $result.=' package="'.$name.'"></parameter>'."\n";
+    return $result;
 }
 
 sub meta_stores_write {
     my ($name,$type,$display)=@_;
-    return '<stores part="'.$Apache::inputtags::part.
-	         '" name="'.$name.
-                 '" type="'.$type.
-	      '" display="'.$display.
-                       ' [Part: '.$Apache::inputtags::part.']"></stores>'
-     ."\n";
+    my $partref=$Apache::inputtags::part;
+    my $result = '<stores part="'.$Apache::inputtags::part.'"';
+    if (defined($Apache::inputtags::response[-1])) {
+      $result.=           ' id="'.$Apache::inputtags::response[-1].'"';
+      $partref.='_'.$Apache::inputtags::response[-1];
+    }	
+    $result.=          ' name="'.$name.'"'.
+                       ' type="'.$type.'"'.
+	            ' display="'.$display.' [Part: '.$partref.']"'.
+		      "></stores>\n";
 }
 
 sub mandatory_part_meta {
@@ -185,36 +211,22 @@ sub start_essayresponse {
 
 sub start_responseparam {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'grade' || $target eq 'web') {
-    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:");
-    if ($value eq '' || $value eq 'con_lost') {
-      &Apache::lonxml::debug("defaulting");
-      $Apache::inputtags::params{$name}=$default;
-    } else {
-      &Apache::lonxml::debug("using value");
-      $Apache::inputtags::params{$name}=$value;
-    }
-    return '';
-  } elsif ($target eq 'meta') {
-    return &meta_parameter_write($token->[2]->{'name'},
-				 $token->[2]->{'type'},
-				 $token->[2]->{'default'},
-				 $token->[2]->{'description'});
+  my $result='';
+  if ($target eq 'meta') {
+    $result = &meta_parameter_write($token->[2]->{'name'},
+				    $token->[2]->{'type'},
+				    $token->[2]->{'default'},
+				    $token->[2]->{'description'});
   } elsif ($target eq 'edit') {
-    my $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
+    $result.=&Apache::edit::tag_start($target,$token,
+				      &Apache::lonxml::description($token));
     $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::text_arg('Type:','type',$token).
 	&Apache::edit::text_arg('Description:','description',$token).
 	  &Apache::edit::text_arg('Default:','default',$token).
 	    "</td></tr>";
     $result.=&Apache::edit::end_table;
-    return $result;
   } elsif ($target eq 'modified') {
-    my $result;
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'name','type','description',
 						 'default');
@@ -222,11 +234,8 @@ sub start_responseparam {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
     }
-    return $result;
-
-  } else {
-    return '';
   }
+  return $result;
 }
 
 sub end_responseparam {
@@ -235,6 +244,36 @@ sub end_responseparam {
   return '';
 }
 
+sub setup_params {
+  my ($tag) = @_;
+
+  @Apache::inputtags::params=();
+  my %paramlist=();
+  foreach my $key (keys(%Apache::lonnet::packagetab)) {
+    if ($key =~ /^$tag/) {
+      my ($package,$name) = split(/&/,$key);
+      $paramlist{$name}=1;
+    }
+  }
+  foreach my $key (keys(%paramlist)) {
+    my $entry= 'resource.'.$Apache::inputtags::part;
+    if (defined($Apache::inputtags::response[-1])) {
+      $entry.='_'.$Apache::inputtags::response[-1];
+    }
+    $entry.='.'.$key;
+    &Apache::lonxml::debug("looking for $entry");
+    my $value = &Apache::lonnet::EXT("$entry");
+    &Apache::lonxml::debug("$key has value :$value:");
+    if ($value eq 'con_lost' || $value =~ /^error:/) {
+      &Apache::lonxml::debug("using nothing");
+      $Apache::inputtags::params{$key}='';
+    } else {
+      &Apache::lonxml::debug("using value");
+      $Apache::inputtags::params{$key}=$value;
+    }
+  }
+}
+
 1;
 __END__