--- loncom/interface/lonprintout.pm 2003/09/25 18:16:04 1.238
+++ loncom/interface/lonprintout.pm 2003/09/25 20:43:31 1.240
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.238 2003/09/25 18:16:04 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.240 2003/09/25 20:43:31 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -655,9 +655,7 @@ ENDPART
$currentURL=$helper->{'VARS'}->{'postdata'};
} else {
#prints resource from the construction space
- $currentURL=$helper->{'VARS'}->{'filename'};
- $currentURL=~s/\/home\//\/~/;
- $currentURL=~s/public_html\///;
+ $currentURL='/'.$helper->{'VARS'}->{'filename'};
if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
}
$selectionmade = 1;
@@ -1148,9 +1146,6 @@ sub printHelper {
# "Remove all duplicate slashes."
$subdir =~ s|/+|/|g;
- # If it's a ~ directory, convert back to /home/user/public_html
- $subdir =~ s/^~(\w+)\//\/home\/$1\/public_html\//;
-
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.
# To prevent security leaks, states are only added to the wizard
@@ -1165,7 +1160,7 @@ sub printHelper {
my $printChoices = [];
my $paramHash;
- if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
+ if ($resourceTitle) {
push @{$printChoices}, ["$resourceTitle (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
}
@@ -1286,9 +1281,10 @@ CHOOSE_FROM_SUBDIR
# Allow the user to select any sequence in the course, feed it to
# another resource selector for that sequence
- push @$printChoices, ["Resources from selected sequence in course",
- 'map_problems_pages', 'CHOOSE_SEQUENCE'];
- &Apache::lonxml::xmlparse($r, 'helper', <{VARS}->{'construction'}) {
+ push @$printChoices, ["Resources from selected sequence in course",
+ 'map_problems_pages', 'CHOOSE_SEQUENCE'];
+ &Apache::lonxml::xmlparse($r, 'helper', <
Select the sequence to print resources from:
@@ -1307,6 +1303,7 @@ CHOOSE_FROM_SUBDIR
CHOOSE_FROM_ANY_SEQUENCE
+}
# Generate the first state, to select which resources get printed.
Apache::lonhelper::state->new("START", "Select Printing Options:");