--- loncom/homework/response.pm	2001/07/13 16:15:01	1.31
+++ loncom/homework/response.pm	2001/08/07 23:17:36	1.41
@@ -2,6 +2,8 @@
 # various response type definitons response definition
 
 # 11/23,11/24,11/28 Gerd Kortemeyer
+# Guy Albertelli
+# 08/04,08/07 Gerd Kortemeyer
 
 package Apache::response;
 use strict;
@@ -11,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);
@@ -26,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 {
@@ -33,8 +48,11 @@ sub setrandomnumber {
   &Apache::lonxml::debug("randseed $rndseed");
 #  $rndseed=unpack("%32i",$rndseed);
   $rndseed=$rndseed
-    +(&Apache::lonnet::numval($Apache::inputtags::part) << 10)
+    +(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+  if (defined($Apache::inputtags::response['-1'])) {
+    $rndseed=$rndseed
       +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
+  }
   srand($rndseed);
   &Apache::lonxml::debug("randseed $rndseed");
   return '';
@@ -42,23 +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.
-	         '" 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;
+    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 {
@@ -69,17 +107,17 @@ sub mandatory_part_meta {
 # of each part
 #
  return
-    &meta_parameter_write('opendate','date_start','',
-                          'Opening Date').
-    &meta_parameter_write('duedate','date_end','',
-                          'Due Date').
-    &meta_parameter_write('answerdate','date_start','',
-                          'Show Answer Date').
-    &meta_parameter_write('weight','int_zeropos','',
-                          'Available Points').
-    &meta_parameter_write('maxtries','int_pos','',
-                          'Maximum Number of Tries').
-
+#    &meta_parameter_write('opendate','date_start','',
+#                          'Opening Date').
+#    &meta_parameter_write('duedate','date_end','',
+#                          'Due Date').
+#    &meta_parameter_write('answerdate','date_start','',
+#                          'Show Answer Date').
+#    &meta_parameter_write('weight','int_zeropos','',
+#                          'Available Points').
+#    &meta_parameter_write('maxtries','int_pos','',
+#                          'Maximum Number of Tries').
+    &meta_package_write('part').
     &meta_stores_write('solved','string',
                           'Problem Status').
     &meta_stores_write('tries','int_zeropos',
@@ -93,7 +131,31 @@ sub mandatory_part_meta {
 }
 
 sub check_for_previous {
-  return '0';
+  my ($curresponse,$partid,$id) = @_;
+  my %previous;
+  $previous{'used'} = 0;
+  foreach my $key (reverse(sort(keys(%Apache::lonhomework::history)))) {
+    if ($key =~ /resource\.$partid\.$id\.submission/) {
+      &Apache::lonxml::debug("Trying $key");
+      my $pastresponse=$Apache::lonhomework::history{$key};
+      if ($pastresponse eq $curresponse) {
+	$previous{'used'} = 1;
+	my $history;
+	if ( $key =~ /^(\d+):/ ) {
+	  $history=$1;
+	  $previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
+	  $previous{'last'}='0';
+	} else {
+	  $previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"};
+	  $previous{'last'}='1';
+	}
+	if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN';	}
+	&Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:");
+	last;
+      }
+    }
+  }
+  return %previous;
 }
 
 sub start_caparesponse {
@@ -115,7 +177,8 @@ sub start_numericalresponse {
   require Apache::caparesponse; 
   import Apache::caparesponse; 
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  return &Apache::caparesponse::start_numericalresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+  return &Apache::caparesponse::start_numericalresponse
+    ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }
 
 sub start_radiobuttonresponse {
@@ -151,10 +214,15 @@ sub start_responseparam {
   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");
+    my $entry= 'resource.'.$Apache::inputtags::part;
+    if (defined($Apache::inputtags::response[-1])) {
+      $entry.='_'.$Apache::inputtags::response[-1];
+    }
+    $entry.='.'.$name;
+    &Apache::lonxml::debug("looking for $entry");
+    my $value = &Apache::lonnet::EXT("$entry");
     &Apache::lonxml::debug("$name has value :$value: and default :$default:");
-    if ($value eq '' || $value eq 'con_lost') {
+    if ($value eq '' || $value eq 'con_lost' || $value =~ /^error:/) {
       &Apache::lonxml::debug("defaulting");
       $Apache::inputtags::params{$name}=$default;
     } else {