--- loncom/homework/hint.pm	2001/08/11 17:06:52	1.17
+++ loncom/homework/hint.pm	2001/10/09 20:45:13	1.20
@@ -14,7 +14,7 @@ sub start_hintgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $skiptoend='0';
   my $result;
-  
+
   if ($target eq 'web') {
     my $id=$Apache::inputtags::part;
     my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
@@ -27,9 +27,9 @@ sub start_hintgroup {
     } else {
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
     }
-  }
-  if ($skiptoend) {
-    &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+    if ($skiptoend) {
+      &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+    }
   }
   @Apache::hint::which=();
   return $result;
@@ -46,11 +46,13 @@ sub end_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
-    if ( $numtries => $hinttries ) {
-      if ($target eq 'web') {$result='</td></tr></table>';}
-    }	
+    if ( $numtries >= $hinttries ) {
+      $result='</td></tr></table>';
+    }
+  } elsif ($target eq 'edit') {
+    $result.=&Apache::edit::end_table();
   }
-  @Apache::hint::which='';
+  @Apache::hint::which=();
   return $result;
 }
 
@@ -58,7 +60,24 @@ sub start_numericalhint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   #do everything in end, so intervening <responseparams> work
   &Apache::response::start_hintresponse($parstack,$safeeval);
-  return '';
+  my $result;
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token);
+    $result.=&Apache::edit::text_arg('Name:','name',$token);
+    $result.=&Apache::edit::text_arg('Answer:','answer',$token);
+    $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
+    $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+    $result.='</td></tr><tr><td colspan="3">';
+  } elsif ($target eq 'modified') {
+    my $constructtag=
+      &Apache::edit::get_new_args($token,$parstack,$safeeval,
+				  'name','answer','unit', 'format');
+    if ($constructtag) {
+      $result  = &Apache::edit::rebuild_tag($token);
+      $result .= &Apache::edit::handle_insert();
+    }
+  }
+  return $result;
 }
 
 sub end_numericalhint {
@@ -67,13 +86,23 @@ sub end_numericalhint {
   if ($target eq 'web') {
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
-    my $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
+    &Apache::response::setup_params('numericalhint');
+    my $partid=$Apache::inputtags::part;
+    my $id=$Apache::inputtags::response['-1'];
+    #id submissions occured under
+    my $submitid=$Apache::inputtags::response['-2'];
+    my $response = $Apache::lonhomework::history{
+			    "resource.$partid.$submitid.submission"};
     &Apache::lonxml::debug("hintgroup is using $response<br />\n");
+    #build safe space expression
     my $expression="&caparesponse_check_list('".$response."','".
-      $$parstack[$#$parstack].
-	';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
-	';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
-	  "');";
+      $$parstack[$#$parstack];
+    #need to get all possible parms
+    foreach my $key (keys(%Apache::inputtags::params)) {
+      $expression.= ';my $'. #'
+	$key.'="'.$Apache::inputtags::params{$key}.'"';
+    }
+    $expression.="');";
     $result = &Apache::run::run($expression,$safeeval);
     &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");
     my ($awards) = split /:/ , $result;
@@ -82,6 +111,8 @@ sub end_numericalhint {
     $result='';
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalhint');
+  } elsif ($target eq 'edit') {
+    $result.='</td></tr>'.&Apache::edit::end_table;
   }
   &Apache::response::end_hintresponse();
   return $result;
@@ -92,7 +123,7 @@ sub start_hintpart {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $show ='0';
-
+  my $result = '';
   if ($target eq 'web') {
     my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);
     &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
@@ -107,12 +138,26 @@ sub start_hintpart {
     }
   } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
+  } elsif ($target eq 'edit') {
+    $result.= &Apache::edit::tag_start($target,$token,
+				       &Apache::lonxml::description($token));
+    $result.= &Apache::edit::text_arg('On:','on',$token).'</td></tr><tr><td colspan="3">';
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						 'on');
+    if ($constructtag) {
+      $result = &Apache::edit::rebuild_tag($token);
+      $result.=&Apache::edit::handle_insert();
+    }
   }
-  return '';
+  return $result;
 }
 
 sub end_hintpart {
-  return '';
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  my $result;
+  if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+  return $result;
 }
 
 1;