[LON-CAPA-cvs] cvs: loncom(version_1_1_X) /interface printout.pl

[albertel]

albertel		Thu Mar  4 00:21:34 2004 EDT

  Modified files:              (Branch: version_1_1_X)
    /loncom/interface	printout.pl 
  Log:
  - backport 1.41
  
  
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.40.2.1 loncom/interface/printout.pl:1.40.2.2
--- loncom/interface/printout.pl:1.40.2.1	Thu Feb 12 17:50:35 2004
+++ loncom/interface/printout.pl	Thu Mar  4 00:21:34 2004
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.40.2.1 2004/02/12 22:50:35 albertel Exp $
+# $Id: printout.pl,v 1.40.2.2 2004/03/04 05:21:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,13 +71,18 @@
       my $noteps;
       foreach $not_eps (@content_of_file) {
 	  if ($not_eps ne '') {
+	      $not_eps=~s|\/\.\/|\/|g;
 	      my $eps_f = $not_eps;
 	      $eps_f =~ s/\.[^.]*$/\.eps/i;
-	      $_ = $eps_f;
-	      m/\/home\/httpd\/html\/res\/(.+)/;
-	      $eps_f = '/home/httpd/prtspool/'.$1;
+	      if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
+                  $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
+		  $eps_f = '/home/httpd/prtspool/'.$eps_f;
+	      } else {
+		  $eps_f=~m/\/home\/httpd\/html\/res\/(.+)/;
+		  $eps_f = '/home/httpd/prtspool/'.$1;
+	      }
 	      my $path=$eps_f;
-	      $path=~s/\/([^\/]+)\.eps$//; 
+	      $path=~s/\/([^\/]+)\.eps$//;
 	      File::Path::mkpath($path,0,0777);
 	      my $image = Image::Magick->new;
 	      $not_eps =~ s/^\s+//;