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

[sakharuk]

sakharuk		Fri Aug  1 15:22:48 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Bug 1693 (Skip external resources in print) is fixed.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.206 loncom/interface/lonprintout.pm:1.207
--- loncom/interface/lonprintout.pm:1.206	Fri Aug  1 10:47:15 2003
+++ loncom/interface/lonprintout.pm	Fri Aug  1 15:22:47 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.206 2003/08/01 14:47:15 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.207 2003/08/01 19:22:47 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -651,13 +651,15 @@
 		($result,$number_of_columns) = &page_cleanup($result);
 	    }
 	} else {
-#	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
-#	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
-#	      $result.=$1;
-#	  } else {
-#	      $result.=$ENV{'form.url'};
-#	  }
-#	  $result.=' \end{document}'
+	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+	  if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+	      $result.=$1;
+	  } elsif ($currentURL=~/\/ext\//) {
+	      $result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+	  } else {
+	      $result.=$currentURL;
+	  }
+	  $result.=' \end{document}'
 	}
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
@@ -901,7 +903,7 @@
 
     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
     
-	my $key; 
+#	my $key; 
 #	foreach $key (keys %parmhash) {
 #	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
 #	}