--- loncom/homework/hint.pm	2001/08/17 21:42:19	1.18
+++ loncom/homework/hint.pm	2002/01/24 04:18:54	1.25
@@ -1,10 +1,38 @@
+# The LearningOnline Network with CAPA 
+# implements the tags that control the hints
+#
+# $Id: hint.pm,v 1.25 2002/01/24 04:18:54 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+
 package Apache::hinttags; 
 
 use strict;
 use Apache::lonnet;
 use capa;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
 }
 
@@ -14,7 +42,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 +55,11 @@ 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]);
+    }
+  } elsif ($target eq 'tex') {
+    $result .= '\noindent{\it Hint: }'; 
   }
   @Apache::hint::which=();
   return $result;
@@ -46,11 +76,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 +90,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 {
@@ -92,6 +141,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;
@@ -102,7 +153,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");
@@ -117,12 +168,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;