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

[albertel]

albertel		Thu Sep 25 16:43:31 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - corrections to deal with changing display dir to ~ style
  - $helper->{'VARS'}->{'postdata'} isn't set in CSTR space?
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.239 loncom/interface/lonprintout.pm:1.240
--- loncom/interface/lonprintout.pm:1.239	Thu Sep 25 14:19:34 2003
+++ loncom/interface/lonprintout.pm	Thu Sep 25 16:43:31 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.239 2003/09/25 18:19:34 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 @@
 	    $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;
@@ -1162,7 +1160,7 @@
     my $printChoices = [];
     my $paramHash;
 
-    if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
+    if ($resourceTitle) {
         push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
     }