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

[sakharuk]

sakharuk		Thu May  8 15:16:42 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  The whole functionality is restored. Plus new option - printing only published or unpublished resources from the construction space is added.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.159 loncom/interface/lonprintout.pm:1.160
--- loncom/interface/lonprintout.pm:1.159	Thu May  8 14:41:16 2003
+++ loncom/interface/lonprintout.pm	Thu May  8 15:16:42 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.159 2003/05/08 18:41:16 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.160 2003/05/08 19:16:42 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1749,16 +1749,9 @@
 
     # "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