--- loncom/homework/response.pm	2000/11/28 19:15:48	1.9
+++ loncom/homework/response.pm	2000/12/04 21:16:29	1.12
@@ -11,26 +11,27 @@ sub BEGIN {
 }
 
 sub meta_parameter_write {
-    my ($partid,$name,$type,$default,$display)=@_;
-    return '<parameter part="'.$partid.
+    my ($name,$type,$default,$display)=@_;
+    return '<parameter part="'.$Apache::inputtags::part.
 	            '" name="'.$name.
                     '" type="'.$type.
                  '" default="'.$default.
-	         '" display="'.$display.' [Part: '.$partid.']"></parameter>'
+	         '" display="'.$display.
+                          ' [Part: '.$Apache::inputtags::part.']"></parameter>'
      ."\n";
 }
 
 sub meta_stores_write {
-    my ($partid,$name,$type,$display)=@_;
-    return '<stores part="'.$partid.
+    my ($name,$type,$display)=@_;
+    return '<stores part="'.$Apache::inputtags::part.
 	         '" name="'.$name.
                  '" type="'.$type.
-	      '" display="'.$display.' [Part: '.$partid.']"></stores>'
+	      '" display="'.$display.
+                       ' [Part: '.$Apache::inputtags::part.']"></stores>'
      ."\n";
 }
 
 sub mandatory_part_meta {
-  my $partid=shift;
 #
 # Autogenerate metadata for mandatory
 # input (from RAT or lonparmset) and 
@@ -38,22 +39,22 @@ sub mandatory_part_meta {
 # of each part
 #
  return
-    &meta_parameter_write($partid,'opendate','date_start','',
+    &meta_parameter_write('opendate','date_start','',
                           'Opening Date').
-    &meta_parameter_write($partid,'duedate','date_end','',
+    &meta_parameter_write('duedate','date_end','',
                           'Due Date').
-    &meta_parameter_write($partid,'answerdate','date_start','',
+    &meta_parameter_write('answerdate','date_start','',
                           'Show Answer Date').
-    &meta_parameter_write($partid,'weight','int_zeropos','',
+    &meta_parameter_write('weight','int_zeropos','',
                           'Available Points').
-    &meta_parameter_write($partid,'maxtries','int_pos','',
+    &meta_parameter_write('maxtries','int_pos','',
                           'Maximum Number of Tries').
 
-    &meta_stores_write($partid,'solved','string',
+    &meta_stores_write('solved','string',
                           'Problem Status').
-    &meta_stores_write($partid,'tries','int_zeropos',
+    &meta_stores_write('tries','int_zeropos',
                           'Number of Unsuccessful Tries').
-    &meta_stores_write($partid,'awarded','float',
+    &meta_stores_write('awarded','float',
 		          'Partial Credit Factor');
 #
 # Note: responseid-specific data 'submission' and 'awarddetail'
@@ -72,7 +73,7 @@ sub start_caparesponse {
 
 sub start_responseparam {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  if ($target ne 'meta') {
+  if ($target eq 'grade') {
     my $args='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $default = &Apache::run::run("{$args;".'return $default}',$safeeval);
@@ -80,19 +81,21 @@ 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) {
+    if ($value eq '') {
+      &Apache::lonxml::debug("defaullting");
       $Apache::inputtags::params{$name}=$default;
     } else {
+      &Apache::lonxml::debug("using value");
       $Apache::inputtags::params{$name}=$value;
     }
     return '';
-  } else {
-    return &meta_parameter_write(
-				 $Apache::inputtags::part,
-				 $token->[2]->{'name'},
+  } elsif ($target eq 'meta') {
+    return &meta_parameter_write($token->[2]->{'name'},
 				 $token->[2]->{'type'},
 				 $token->[2]->{'default'},
 				 $token->[2]->{'description'});
+  } else {
+    return '';
   }
 }