--- loncom/interface/lonprintout.pm 2003/05/08 18:33:03 1.158 +++ loncom/interface/lonprintout.pm 2003/05/08 19:16:42 1.160 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.158 2003/05/08 18:33:03 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.160 2003/05/08 19:16:42 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1394,8 +1394,6 @@ ENDPART # } # $result.=' \end{document}' } - - } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { @@ -1751,16 +1749,9 @@ sub printHelper { # "Delete everything after the last slash." $subdir =~ s|/[^/]+$||; - if (not defined $helper->{VARS}->{'construction'}) { - $subdir = '/home/httpd/html/res'.$subdir; - } else { - $helper->{VARS}->{'construction'}=~/^([^\/]+)\/\/([^\/]+)(.*)\/[^\/]*$/; - $subdir = $3; - $subdir=~/\/~([^\/]+)\/(.*)$/; - $subdir = '/home/'.$1.'/public_html/'.$2; + if (not $helper->{VARS}->{'construction'}) { + $subdir='/home/httpd/html/res/'.$subdir; } -#### $r->print('Dir: '.$subdir.' '); -#### return OK; # What can be printed is a very dynamic decision based on @@ -1784,7 +1775,7 @@ sub printHelper { $r->print($helper->{VARS}->{'postdata'}); # If we're in a sequence... - if (!defined($helper->{'VARS'}->{'construction'})) { + if ($helper->{'VARS'}->{'construction'} ne '1') { # Allow problems from sequence push @{$printChoices}, ["Problem(s) from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; # Allow all resources from sequence