[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[foxr]

foxr		Wed Dec 16 11:06:48 2009 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Remove extra LaTeX header stuff from syllabus e.g.  Still issues
  with printing syllabus in print resources for selected students.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.566 loncom/interface/lonprintout.pm:1.567
--- loncom/interface/lonprintout.pm:1.566	Mon Nov 30 11:03:07 2009
+++ loncom/interface/lonprintout.pm	Wed Dec 16 11:06:48 2009
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.566 2009/11/30 11:03:07 foxr Exp $
+# $Id: lonprintout.pm,v 1.567 2009/12/16 11:06:48 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2119,8 +2119,7 @@
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		$resources_printed .= $currentURL.':';
-		my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		$texversion .= &ssi_with_retries($currentURL, $ssi_retry_count, %form);
+		my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 		    my $annotation = &annotate($currentURL);
 		    $texversion    =~ s/(\\end{document})/$annotation$1/;
@@ -2153,7 +2152,6 @@
 
        
 	} else {
-	    &Apache::lonnet::logthis("Unsupported type handler");
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
 	}
@@ -2303,8 +2301,7 @@
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
-		my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		$texversion .= &ssi_with_retries($urlp, $ssi_retry_count, %form);
+		my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 		    my $annotation = &annotate($urlp);
 		    $texversion =~ s/(\\end{document)/$annotation$1/;
@@ -2808,7 +2805,6 @@
     #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #
-
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
 	    if($i != 0) {
@@ -2868,6 +2864,7 @@
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
 		    $printed .= $curresline.':';
+
 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 			my $url = &Apache::lonnet::clutter($res_url);