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

raeburn raeburn at source.lon-capa.org
Mon Dec 5 22:46:10 EST 2016


raeburn		Tue Dec  6 03:46:10 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - For 2.11
    - Backport 1.651, 1.652
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.627.2.18 loncom/interface/lonprintout.pm:1.627.2.19
--- loncom/interface/lonprintout.pm:1.627.2.18	Wed Aug 10 16:25:24 2016
+++ loncom/interface/lonprintout.pm	Tue Dec  6 03:46:09 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.627.2.18 2016/08/10 16:25:24 raeburn Exp $
+# $Id: lonprintout.pm,v 1.627.2.19 2016/12/06 03:46:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2748,7 +2748,7 @@
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-      
+
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
@@ -2961,6 +2961,7 @@
 	    my $texversion='';
 	    if ($urlp!~m|^/adm/|
 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+                my $extension = $1;
 		$resources_printed .= $urlp.':';
 		&Apache::lonxml::remember_problem_counter();
 		if ($flag_latex_header_remove eq 'NO') {
@@ -2969,7 +2970,7 @@
                             (($i==0) &&
                              (($urlp=~/\.page$/) ||
                               ($print_type eq 'map_problems_in_page') ||
-                              ($print_type eq 'map_resources_in_page')))) {
+                              (($print_type eq 'map_resources_in_page') && ($extension !~ /^x?html?$/))))) {
                         $flag_latex_header_remove = 'YES';
                     }
 		}




More information about the LON-CAPA-cvs mailing list