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

[albertel]

albertel		Tue Jan 17 13:02:34 2006 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - ext refs that ended in .html were being attempted to be be printed
    (BUG#4580)
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.412 loncom/interface/lonprintout.pm:1.413
--- loncom/interface/lonprintout.pm:1.412	Fri Dec 23 03:32:46 2005
+++ loncom/interface/lonprintout.pm	Tue Jan 17 13:02:34 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.412 2005/12/23 08:32:46 albertel Exp $
+# $Id: lonprintout.pm,v 1.413 2006/01/17 18:02:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1078,7 +1078,8 @@
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-	if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	if ($cleanURL!~m|^/adm/|
+	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
@@ -1147,7 +1148,8 @@
 	    if ($currentURL=~m/\.page\s*$/) {
 		($result,$number_of_columns) = &page_cleanup($result);
 	    }
-        } elsif ($currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+        } elsif ($cleanURL!~m|^/adm/|
+		 && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
             #printing content of sequence from the construction space	
 	    my $flag_latex_header_remove = 'NO'; 
 	    my $rndseed=time;
@@ -1265,7 +1267,8 @@
 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
 	    my $texversion='';
-	    if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	    if ($urlp!~m|^/adm/|
+		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 		$resources_printed .= $urlp.':';
 		my $pre_counter=$env{'form.counter'};
 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
@@ -1737,7 +1740,8 @@
 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
-		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		if ($res_url!~m|^/adm/|
+		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 		    $printed .= $curresline.':';
 		    my $pre_counter=$env{'form.counter'};
 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);