[LON-CAPA-cvs] cvs: loncom /homework hint.pm

[albertel]

albertel		Mon Oct 14 16:42:57 2002 EDT

  Modified files:              
    /loncom/homework	hint.pm 
  Log:
  - addtion of more hint types string/formula
  
  
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.27 loncom/homework/hint.pm:1.28
--- loncom/homework/hint.pm:1.27	Wed Mar  6 15:39:15 2002
+++ loncom/homework/hint.pm	Mon Oct 14 16:42:57 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.27 2002/03/06 20:39:15 sakharuk Exp $
+# $Id: hint.pm,v 1.28 2002/10/14 20:42:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@
 use capa;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
+  &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint'));
 }
 
 
@@ -97,14 +97,28 @@
     $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);
+    if ($token->[1] eq 'numericalhint') {
+      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
+      $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+    } elsif ($token->[1] eq 'stringhint') {
+      $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);
+    } elsif ($token->[1] eq 'formulahint') {
+      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+    }
     $result.=&Apache::edit::end_row();
     $result.=&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
-    my $constructtag=
-      &Apache::edit::get_new_args($token,$parstack,$safeeval,
-				  'name','answer','unit', 'format');
+    my $constructtag;
+    if ($token->[1] eq 'numericalhint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','unit','format');
+    } elsif ($token->[1] eq 'stringhint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','type');
+    } elsif ($token->[1] eq 'formulahint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','samples');
+    }
     if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
@@ -149,6 +163,36 @@
   }
   &Apache::response::end_hintresponse();
   return $result;
+}
+
+sub start_stringhint {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('stringhint');
+  } else {
+    $result.=&start_numericalhint(@_);
+  }
+  return $result;
+}
+
+sub end_stringhint {
+  return end_numericalhint(@_);
+}
+
+sub start_formulahint {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('formulahint');
+  } else {
+    $result.=&start_numericalhint(@_);
+  }
+  return $result;
+}
+
+sub end_formulahint {
+  return end_numericalhint(@_);
 }
 
 # a part shows if it is on, if no specific parts are on, then default shows