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

sakharuk lon-capa-cvs@mail.lon-capa.org
Tue, 06 May 2003 13:50:23 -0000


sakharuk		Tue May  6 09:50:23 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Content of subdirectory now can be printed but only for the published problems. I still have a lot of problems with construction space - Jeremy's wizard does some strange things there.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.151 loncom/interface/lonprintout.pm:1.152
--- loncom/interface/lonprintout.pm:1.151	Mon May  5 16:14:32 2003
+++ loncom/interface/lonprintout.pm	Tue May  6 09:50:23 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.151 2003/05/05 20:14:32 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.152 2003/05/06 13:50:23 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1511,49 +1511,49 @@
         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
 	my $flag_latex_header_remove = 'NO';  
 	for (my $i=0;$i<=$#list_of_files;$i++) {
-#	    my $urlp = $list_of_files[$i];
-#	    if ($urlp=~/\//) {
+	    my $urlp = $list_of_files[$i];
+	    if ($urlp=~/\//) {
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		$moreenv{'form.textwidth'}=$LaTeXwidth;
 		&Apache::lonnet::appenv(%moreenv);
-#		if ($urlp =~ m|/home/([^/]+)/public_html|) {
-#		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
-#		} else {
-#		    $urlp =~ s|^/home/httpd/html||;
-#		}
-#		my $texversion=&Apache::lonnet::ssi($urlp);
+		if ($urlp =~ m|/home/([^/]+)/public_html|) {
+		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
+		} else {
+		    $urlp =~ s|^/home/httpd/html||;
+		}
+		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target','form.textwidth');
                 #this chunck is responsible for printing the path to problem
-#		my $newurlp = '';
-#		my $HowMany = length($urlp)*2;
-#		if ($HowMany > $LaTeXwidth) {
-#		    my @temporrary = split '/',$urlp;
-#		    my $HowManyNew = 0;
-#		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
-#			if ($temporrary[$ii] ne '') {
-#			    $HowManyNew += length($temporrary[$ii])*2;
-#			    if ($HowManyNew < $LaTeXwidth ) {
-#				$newurlp .=  '/'.$temporrary[$ii];
-#			    } else {
-#				$HowManyNew = 0;
-#				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
-#				$ii--;
-#			    }
-#			}
-#		    }
-#		}
-#		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
-#		if ($flag_latex_header_remove ne 'NO') {
-#		    $texversion = &latex_header_footer_remove($texversion);
-#		} else {
-#		    $texversion =~ s/\\end{document}//;
-#		}
-#		$result .= $texversion;
-#	    }
-#	    $flag_latex_header_remove = 'YES';  
+		my $newurlp = '';
+		my $HowMany = length($urlp)*2;
+		if ($HowMany > $LaTeXwidth) {
+		    my @temporrary = split '/',$urlp;
+		    my $HowManyNew = 0;
+		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
+			if ($temporrary[$ii] ne '') {
+			    $HowManyNew += length($temporrary[$ii])*2;
+			    if ($HowManyNew < $LaTeXwidth ) {
+				$newurlp .=  '/'.$temporrary[$ii];
+			    } else {
+				$HowManyNew = 0;
+				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+				$ii--;
+			    }
+			}
+		    }
+		}
+		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
+		$result .= $texversion;
+	    }
+	    $flag_latex_header_remove = 'YES';  
 	}
-#	$result .= '\end{document}';      	
+	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
     $result = &page_format_transformation_new($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
@@ -1741,7 +1741,7 @@
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
-    $subdir =  '/home/httpd/html/res'.$subdir.'/';
+    $subdir =  '/home/httpd/html/res'.$subdir;   #needs additional work for the construction space
 
     # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.