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

[www]

www		Sat Nov  5 22:50:48 2011 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Cleanup
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.602 loncom/interface/lonprintout.pm:1.603
--- loncom/interface/lonprintout.pm:1.602	Sat Nov  5 21:49:25 2011
+++ loncom/interface/lonprintout.pm	Sat Nov  5 22:50:47 2011
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.602 2011/11/05 21:49:25 www Exp $
+# $Id: lonprintout.pm,v 1.603 2011/11/05 22:50:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3049,11 +3049,7 @@
 	    if ($urlp=~/\//) {
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'rndseed'}=$rndseed;
-		if ($urlp =~ m|/home/([^/]+)/public_html|) {
-		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
-		} else {
-		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
-		}
+		$urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		$resources_printed .= $urlp.':';
 		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
@@ -3084,9 +3080,7 @@
 		}
                 #this chunk is responsible for printing the path to problem
 
-		my $newurlp=$urlp;
-		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
-		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
+		my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);