[LON-CAPA-cvs] cvs: loncom(version_1_2_X) /homework structuretags.pm /interface lonprintout.pm

[albertel]

albertel		Wed Sep 22 16:49:45 2004 EDT

  Modified files:              (Branch: version_1_2_X)
    /loncom/interface	lonprintout.pm 
    /loncom/homework	structuretags.pm 
  Log:
  - backporting <instructorcomment> fix (lonprintout.pm 1.330, strcturetags.pm 1.269)
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.316.2.1 loncom/interface/lonprintout.pm:1.316.2.2
--- loncom/interface/lonprintout.pm:1.316.2.1	Thu Aug 19 16:03:47 2004
+++ loncom/interface/lonprintout.pm	Wed Sep 22 16:49:45 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.316.2.1 2004/08/19 20:03:47 albertel Exp $
+# $Id: lonprintout.pm,v 1.316.2.2 2004/09/22 20:49:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1031,6 +1031,7 @@
 	 #loop over students
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
+         $moreenv{'instructor_comments'}='hide';
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.260.2.4 loncom/homework/structuretags.pm:1.260.2.5
--- loncom/homework/structuretags.pm:1.260.2.4	Sun Aug 29 03:51:22 2004
+++ loncom/homework/structuretags.pm	Wed Sep 22 16:49:45 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.260.2.4 2004/08/29 07:51:22 albertel Exp $
+# $Id: structuretags.pm,v 1.260.2.5 2004/09/22 20:49:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -861,7 +861,7 @@
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
-	if ( ! $result ) {
+	if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
 						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");