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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 02 Aug 2005 18:05:30 -0000


albertel		Tue Aug  2 14:05:30 2005 EDT

  Modified files:              
    /loncom/homework	inputtags.pm response.pm 
  Log:
  - Fix BUG# 4263
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.172 loncom/homework/inputtags.pm:1.173
--- loncom/homework/inputtags.pm:1.172	Mon Jul 11 15:45:07 2005
+++ loncom/homework/inputtags.pm	Tue Aug  2 14:05:25 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.172 2005/07/11 19:45:07 albertel Exp $
+# $Id: inputtags.pm,v 1.173 2005/08/02 18:05:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,9 +43,13 @@
     # list of all input ids seen in this problem
     @Apache::inputtags::inputlist=();
     # list of all current response ids
-    @Apache::inputtags::response=();
+    @Apache::inputtags::hint=();
     # list of all response ids seen in this problem
     @Apache::inputtags::responselist=();
+    # list of all current hint ids
+    @Apache::inputtags::response=();
+    # list of all hint ids seen in this problem
+    @Apache::inputtags::hintlist=();
     # list of whether or not a specific response was previously used
     @Apache::inputtags::previous=();
     # submission it was used in
@@ -75,6 +79,7 @@
     my %check;
     foreach my $id (@Apache::inputtags::partlist,
 		    @Apache::inputtags::responselist,
+		    @Apache::inputtags::hintlist,
 		    @Apache::inputtags::importlist) {
 	$check{$id}++;
     }
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.122 loncom/homework/response.pm:1.123
--- loncom/homework/response.pm:1.122	Wed Jun 29 15:20:10 2005
+++ loncom/homework/response.pm	Tue Aug  2 14:05:25 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.122 2005/06/29 19:20:10 albertel Exp $
+# $Id: response.pm,v 1.123 2005/08/02 18:05:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,14 +71,14 @@
     my ($parstack,$safeeval)=@_;
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
-    push (@Apache::inputtags::response,$id);
-    push (@Apache::inputtags::responselist,$id);
+    push (@Apache::inputtags::hint,$id);
+    push (@Apache::inputtags::hintlist,$id);
     push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
     return $id;
 }
 
 sub end_hintresponse {
-    pop @Apache::inputtags::response;
+    pop @Apache::inputtags::hint;
     if (defined($Apache::inputtags::paramstack[-1])) {
 	%Apache::inputtags::params=
 	    @{ pop(@Apache::inputtags::paramstack) };