[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 07 Nov 2006 20:07:12 -0000
albertel Tue Nov 7 15:07:12 2006 EDT
Modified files:
/loncom/homework bridgetask.pm
Log:
- fixup webgade display to once again not include the questiontext
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.194 loncom/homework/bridgetask.pm:1.195
--- loncom/homework/bridgetask.pm:1.194 Tue Nov 7 14:43:37 2006
+++ loncom/homework/bridgetask.pm Tue Nov 7 15:07:10 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.194 2006/11/07 19:43:37 albertel Exp $
+# $Id: bridgetask.pm,v 1.195 2006/11/07 20:07:10 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2284,7 +2284,7 @@
$result.=
&nested_parse(\$dimension{$dim}{'questiontext'},[@_],
{'set_dim_id' => undef,
- 'delayed_dim_results' => 0});
+ 'delayed_dim_results' => 1});
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
@{$dimension{$dim}{'criterias'}} ) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
@@ -2518,7 +2518,13 @@
my $dim = &get_dim_id();
my $id=&get_id($parstack,$safeeval);
if ($target eq 'web' || $target eq 'webgrade') {
- $result .= &internal_location($id);
+ if ($target eq 'webgrade' && $dim ne 'top') {
+ &Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
+ $dimension{$dim}{'result'} .= &internal_location($id);
+ } else {
+ &Apache::lonxml::debug(" not stashing $dim $id");
+ $result .= &internal_location($id);
+ }
}
&Apache::lonxml::debug("Criteria $id with $dim");
if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {