--- loncom/interface/lonprintout.pm 2003/07/28 13:46:42 1.205 +++ loncom/interface/lonprintout.pm 2003/08/01 19:22:47 1.207 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.205 2003/07/28 13:46:42 bowersj2 Exp $ +# $Id: lonprintout.pm,v 1.207 2003/08/01 19:22:47 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -619,6 +619,7 @@ ENDPART $currentURL=$helper->{'VARS'}->{'filename'}; $currentURL=~s/\/home\//\/~/; $currentURL=~s/public_html\///; + if ($currentURL=~/([^?]+)/) {$currentURL=$1;} } $selectionmade = 1; if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { @@ -650,13 +651,15 @@ ENDPART ($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 @@ -900,7 +903,7 @@ sub handler { my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); - my $key; +# my $key; # foreach $key (keys %parmhash) { # $r->print(' '.$key.'->'.$parmhash{$key}.'<-
'); # }