[LON-CAPA-cvs] cvs: loncom(version_2_1_X) /homework bridgetask.pm

[albertel]

albertel		Mon Jun  5 13:15:40 2006 EDT

  Modified files:              (Branch: version_2_1_X)
    /loncom/homework	bridgetask.pm 
  Log:
  - backport 1.153
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.128.2.9 loncom/homework/bridgetask.pm:1.128.2.10
--- loncom/homework/bridgetask.pm:1.128.2.9	Wed Apr 19 16:36:19 2006
+++ loncom/homework/bridgetask.pm	Mon Jun  5 13:15:37 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.128.2.9 2006/04/19 20:36:19 albertel Exp $
+# $Id: bridgetask.pm,v 1.128.2.10 2006/06/05 17:15:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1796,7 +1796,13 @@
 	    my $mandatory_failed=0;
 	    my $ungraded=0;
 	    my $review=0;
+
+	    @Apache::scripttag::parser_env = @_;
+	    $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+		@Apache::scripttag::parser_env = @_;
+		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.tex
+t'});
 		my $link=&link($instance,$id);
 		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
 		$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
@@ -1873,7 +1879,7 @@
 sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'web' || $target eq 'webgrade') {
 	if ($tagstack->[-2] eq 'Dimension') {
 	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	
@@ -1914,7 +1920,7 @@
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
 	$dimension{$instance_id.'.text'}=$text;
     }
     return '';