--- loncom/interface/lonprintout.pm 2002/07/08 17:31:36 1.37
+++ loncom/interface/lonprintout.pm 2002/09/04 04:03:00 1.51.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.37 2002/07/08 17:31:36 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.51.2.1 2002/09/04 04:03:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,6 +58,7 @@ sub headerform {
</head>
<body bgcolor="FFFFFF">
<form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
+<tt>$ENV{'form.postdata'}</tt><p>
<h1>What do you want to print? Make a choice.</h1><br />
ENDHEADER
}
@@ -70,19 +71,23 @@ sub menu_for_output {
<input type="hidden" name="url" value="$ENV{'form.postdata'}">
<input type="radio" name="choice" value="Standard LaTeX output for current document" checked> Current document
(you will print what you see on the screen)<br />
+ENDMENUOUT1
+ if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
+ $r->print(<<ENDMENUOUT2);
<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence"> All problems from the primary sequence<br />
<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence"> The whole primary sequence (problems plus all html and xml files)<br />
<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence"> All problems from the top level sequence<br />
<br />
-ENDMENUOUT1
- my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
- $subdirtoprint =~ s/\/[^\/]+$//;
- if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
- $r->print(<<ENDMENUOUT2);
-<input type="radio" name="choice" value="Subdirectory print"> All problems from current subdirectory (where this particular problem is)<br />
ENDMENUOUT2
-}
- $r->print(<<ENDMENUOUT3);
+ }
+ my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+ $subdirtoprint =~ s/\/[^\/]+$//;
+ if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+ $r->print(<<ENDMENUOUT4);
+ <input type="radio" name="choice" value="Subdirectory print"> All problems from current subdirectory (where this particular problem is)<br />
+ENDMENUOUT4
+ }
+ $r->print(<<ENDMENUOUT5);
<br /><hr /><br />
<h1>And what page format do you prefer?</h1>
<table>
@@ -93,7 +98,17 @@ ENDMENUOUT2
</td>
<td> </td>
<td rawspan="2">
- Number of columns: <input type="text" size="2" name="numberofcolumns" value="2">
+ Number of columns: <select name="numberofcolumns">
+ <option selected> 1 </option>
+ <option> 2 </option>
+ <option> 3 </option>
+ <option> 4 </option>
+ <option> 5 </option>
+ <option> 6 </option>
+ <option> 7 </option>
+ <option> 8 </option>
+ <option> 9 </option>
+ </select>
</td>
</tr>
</table>
@@ -102,7 +117,7 @@ ENDMENUOUT2
</form>
</body>
</html>
-ENDMENUOUT3
+ENDMENUOUT5
}
@@ -130,14 +145,20 @@ ENDPART
#-- single document - problem, page, html, xml
my %moreenv;
$moreenv{'form.grade_target'}='tex';
+ if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+ $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
+ }
$moreenv{'request.filename'}=$ENV{'form.url'};
&Apache::lonnet::appenv(%moreenv);
my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
&Apache::lonnet::delenv('form.grade_target');
$result .= $texversion;
$result = &additional_cleanup($result);
- if ($ENV{'form.url'}=~m/\.page\s*$/) {($result,$number_of_columns) = &page_cleanup($result);}
- } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
+ if ($ENV{'form.url'}=~m/\.page\s*$/) {
+ ($result,$number_of_columns) = &page_cleanup($result);
+ }
+ } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or
+ $choice eq 'Standard LaTeX output for whole primary sequence') {
#-- minimal sequence to which the current document belongs
#-- where is the primary sequence containing file?
my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
@@ -163,7 +184,7 @@ ENDPART
&Apache::lonnet::delenv('form.grade_target');
$result .= $texversion;
}
- } else {
+ } elsif ($urlp =~ /\S+/) {
my %moreenv;
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
@@ -174,35 +195,58 @@ ENDPART
}
$result = &additional_cleanup($result);
} elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
- my @master_seq = ();
- my @add_file_seq = ();
-#-- where is the main sequence of the course?
+ # where is the main sequence of the course?
my $main_seq = '/res/'.$ENV{'request.course.uri'};
my $file=&Apache::lonnet::filelocation("",$main_seq);
my $filecontents=&Apache::lonnet::getfile($file);
my @file_seq = &content_map($filecontents);
-#-- do we have any other sequence inside?
+ for (my $iu=0;$iu<=$#file_seq;$iu++) {
+ $file_seq[$iu]=~s/^"//;
+ $file_seq[$iu]=~s/"$//;
+ if ($file_seq[$iu]=~m/\S+/) {
+ $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
+ } else {
+ $file_seq[$iu]= 'REMOVE IT PLEASE';
+ }
+ }
my $i=0;
- while ($i<=$#file_seq) {
- $_ = $file_seq[$i];
- if (/\.sequence$/) {
- $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
- $filecontents=&Apache::lonnet::getfile($file);
- @add_file_seq = &content_map($filecontents);
- splice(@file_seq,$i,1,@add_file_seq);
- @add_file_seq = ();
- $i = -1;
+ my $limit = $#file_seq;
+ while ($i<=$limit) {
+ unless ($file_seq[$i]=~m/\.(problem|page)/) {
+ if ($file_seq[$i]=~m/\.sequence/) {
+ my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
+ my @newfile_seq = &content_map($filecontents);
+ for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
+ $newfile_seq[$iu]=~s/^"//;
+ $newfile_seq[$iu]=~s/"$//;
+ if ($newfile_seq[$iu]=~m/\S+/) {
+ $newfile_seq[$iu]=&Apache::lonnet::filelocation("",$newfile_seq[$iu]);
+ } else {
+ $newfile_seq[$iu]= 'REMOVE IT PLEASE';
+ }
+ }
+ splice @file_seq,$i,1,@newfile_seq;
+ $i=0;
+ $limit = $#file_seq;
+ } else {
+ splice @file_seq,$i,1,'REMOVE IT PLEASE';
+ }
}
$i++;
}
- @master_seq = @file_seq;
+ for (my $iu=0;$iu<=$#file_seq;$iu++) {
+ if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
+ splice @file_seq,$iu,1;
+ }
+ }
+ if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
+ pop @file_seq;
+ }
#-- produce an output string
- for (my $i=0;$i<=$#master_seq;$i++) {
- $_ = $master_seq[$i];
- m/\"(.*)\"/;
- $_ = $1;
- my $urlp = $1;
- if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
+ for (my $i=0;$i<=$#file_seq;$i++) {
+ my $urlp = $file_seq[$i];
+ $urlp=~s/\/home\/httpd\/html//;
+ if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
my %moreenv;
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
@@ -216,22 +260,32 @@ ENDPART
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
my @list_of_files = ();
- my $localdirectory = $subdirtoprint;
- $localdirectory =~ s/.*(\/res\/)/$1/;
- my @content_directory = &Apache::lonnet::dirlist($localdirectory);
+ if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+ $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
+ } else {
+ $subdirtoprint =~ s/.*(\/res\/)/$1/;
+ }
+ my @content_directory = ();
+ if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+ @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+ } else {
+ @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
+ }
for (my $iy=0;$iy<=$#content_directory;$iy++) {
my @tempo_array = split(/&/,$content_directory[$iy]);
- $content_directory[$iy] = $tempo_array[0];
- if ($content_directory[$iy] =~ m/^[^\.]+\.problem$/) {
- push @list_of_files,$content_directory[$iy];
+ if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ push(@list_of_files,$tempo_array[0]);
}
}
- $localdirectory =~ s/\/$//;
+ $subdirtoprint =~ s/\/$//;
for (my $i=0;$i<=$#list_of_files;$i++) {
- my $urlp = $localdirectory.'/'.$list_of_files[$i];
+ my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
my %moreenv;
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
+ if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+ $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/;
+ }
my $texversion=&Apache::lonnet::ssi($urlp);
&Apache::lonnet::delenv('form.grade_target');
$texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
@@ -239,11 +293,7 @@ ENDPART
}
$result = &additional_cleanup($result);
-
-
-
-
-
+
}
#-- corrections for the different page formats
if ($layout eq 'CBI' and $numberofcolumns eq '1') {
@@ -261,7 +311,7 @@ ENDPART
$result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;
# $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
- $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
+ $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny \\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright Michigan State University Board of Trustees $1/;
# $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;
$result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
$result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
@@ -275,19 +325,20 @@ ENDPART
$first_comment = index($result,'<!--',$first_comment);
}
$result =~ s/^\s+$//gm; #remove empty lines
- $result =~ s/%/\\%/g; #corrects %
+ $result =~ s/\s%/\\%/g; #corrects %
$result =~ s/(\s)+/$1/g; #removes more than one empty space
$result =~ s/\\\\\s*\\vskip/\\vskip/gm;
- $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
$result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
$result =~ s/{\\par }\s*\\\\/\\\\/gm;
$result =~ s/\\\\\s+\[/ \[/g;
$result =~ s/θ/\$\\theta\$/g; #converts theta from html into tex
- $result =~ s/\b_+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
+ $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
#conversion of html characters to LaTeX equivalents
if ($result =~ m/&(\w+|#\d+);/) {
$result = &character_chart($result);
}
+ $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
+ $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
#-- writing .tex file in prtspool
my $temp_file;
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
@@ -297,7 +348,7 @@ ENDPART
}
print $temp_file $result;
$r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle">
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns">
</body>
</html>
FINALEND
@@ -305,81 +356,82 @@ FINALEND
sub character_chart {
my $result = shift;
- $result =~ s/	//g;
- $result =~ s/
//g;
- $result =~ s/
//g;
- $result =~ s/ / /g;
- $result =~ s/!/!/g;
- $result =~ s/"/"/g;
- $result =~ s/"/"/g; #"
- $result =~ s/#/\\#/g;
- $result =~ s/$/\\\$/g;
- $result =~ s/%/\\%/g;
- $result =~ s/&/\\&/g;
+ $result =~ s/�?0?7;//g;
+ $result =~ s/�?0?9;//g;
+ $result =~ s/�?10;//g;
+ $result =~ s/�?13;//g;
+ $result =~ s/�?32;/ /g;
+ $result =~ s/�?33;/!/g;
+ $result =~ s/�?34;/"/g;
+ $result =~ s/"/"/g;
+ $result =~ s/�?35;/\\#/g;
+# $result =~ s/�?36;/\\\$/g;
+ $result =~ s/�?37;/\\%/g;
+ $result =~ s/�?38;/\\&/g;
$result =~ s/&/\\&/g;
- $result =~ s/'/'/g;
- $result =~ s/(/(/g;
- $result =~ s/)/)/g;
- $result =~ s/*/\*/g;
- $result =~ s/+/\+/g;
- $result =~ s/,/,/g;
- $result =~ s/-/-/g;
- $result =~ s/./\./g;
- $result =~ s///\//g;
- $result =~ s/0/0/g;
- $result =~ s/1/1/g;
- $result =~ s/2/2/g;
- $result =~ s/3/3/g;
- $result =~ s/4/4/g;
- $result =~ s/5/5/g;
- $result =~ s/6/6/g;
- $result =~ s/7/7/g;
- $result =~ s/8/8/g;
- $result =~ s/9/9/g;
- $result =~ s/:/:/g;
- $result =~ s/;/;/g;
- $result =~ s/</\$<\$/g;
+ $result =~ s/�?39;/'/g;
+ $result =~ s/�?40;/(/g;
+ $result =~ s/�?41;/)/g;
+ $result =~ s/�?42;/\*/g;
+ $result =~ s/�?43;/\+/g;
+ $result =~ s/�?44;/,/g;
+ $result =~ s/�?45;/-/g;
+ $result =~ s/�?46;/\./g;
+ $result =~ s/�?47;/\//g;
+ $result =~ s/�?48;/0/g;
+ $result =~ s/�?49;/1/g;
+ $result =~ s/�?50;/2/g;
+ $result =~ s/�?51;/3/g;
+ $result =~ s/�?52;/4/g;
+ $result =~ s/�?53;/5/g;
+ $result =~ s/�?54;/6/g;
+ $result =~ s/�?55;/7/g;
+ $result =~ s/�?56;/8/g;
+ $result =~ s/�?57;/9/g;
+ $result =~ s/�?58;/:/g;
+ $result =~ s/�?59;/;/g;
+ $result =~ s/�?60;/\$<\$/g;
$result =~ s/</\$<\$/g;
- $result =~ s/=/\$=\$/g;
- $result =~ s/>/\$>\$/g;
+ $result =~ s/�?61;/\$=\$/g;
+ $result =~ s/�?62;/\$>\$/g;
$result =~ s/>/\$>\$/g;
- $result =~ s/?/?/g;
-# $result =~ s/@//g;
- $result =~ s/A/A/g;
- $result =~ s/B/B/g;
- $result =~ s/C/C/g;
- $result =~ s/D/D/g;
- $result =~ s/E/E/g;
- $result =~ s/F/F/g;
- $result =~ s/G/G/g;
- $result =~ s/H/H/g;
- $result =~ s/I/I/g;
- $result =~ s/J/J/g;
- $result =~ s/K/K/g;
- $result =~ s/L/L/g;
- $result =~ s/M/M/g;
- $result =~ s/N/N/g;
- $result =~ s/O/O/g;
- $result =~ s/P/P/g;
- $result =~ s/Q/Q/g;
- $result =~ s/R/R/g;
- $result =~ s/S/S/g;
- $result =~ s/T/T/g;
- $result =~ s/U/U/g;
- $result =~ s/V/V/g;
- $result =~ s/W/W/g;
- $result =~ s/X/X/g;
- $result =~ s/Y/Y/g;
- $result =~ s/Z/Z/g;
- $result =~ s/[/[/g;
- $result =~ s/\/\\/g;
- $result =~ s/]/]/g;
-# $result =~ s/^//g;
-# $result =~ s/_//g;
- $result =~ s/`/`/g;
- $result =~ s/a/a/g;
- $result =~ s/b/b/g;
- $result =~ s/c/c/g;
+ $result =~ s/�?63;/?/g;
+# $result =~ s/�?64;//g;
+ $result =~ s/�?65;/A/g;
+ $result =~ s/�?66;/B/g;
+ $result =~ s/�?67;/C/g;
+ $result =~ s/�?68;/D/g;
+ $result =~ s/�?69;/E/g;
+ $result =~ s/�?70;/F/g;
+ $result =~ s/�?71;/G/g;
+ $result =~ s/�?72;/H/g;
+ $result =~ s/�?73;/I/g;
+ $result =~ s/�?74;/J/g;
+ $result =~ s/�?75;/K/g;
+ $result =~ s/�?76;/L/g;
+ $result =~ s/�?77;/M/g;
+ $result =~ s/�?78;/N/g;
+ $result =~ s/�?79;/O/g;
+ $result =~ s/�?80;/P/g;
+ $result =~ s/�?81;/Q/g;
+ $result =~ s/�?82;/R/g;
+ $result =~ s/�?83;/S/g;
+ $result =~ s/�?84;/T/g;
+ $result =~ s/�?85;/U/g;
+ $result =~ s/�?86;/V/g;
+ $result =~ s/�?87;/W/g;
+ $result =~ s/�?88;/X/g;
+ $result =~ s/�?89;/Y/g;
+ $result =~ s/�?90;/Z/g;
+ $result =~ s/�?91;/[/g;
+ $result =~ s/�?92;/\\/g;
+ $result =~ s/�?93;/]/g;
+# $result =~ s/�?94;//g;
+# $result =~ s/�?95;//g;
+ $result =~ s/�?96;/`/g;
+ $result =~ s/�?97;/a/g;
+ $result =~ s/�?98;/b/g;
+ $result =~ s/�?99;/c/g;
$result =~ s/d/d/g;
$result =~ s/e/e/g;
$result =~ s/f/f/g;
@@ -463,8 +515,8 @@ sub character_chart {
# $result =~ s/®//g;
# $result =~ s/¯//g;
# $result =~ s/¯//g;
- $result =~ s/°/\$^\\{\\circ\\}\$/g;
- $result =~ s/°/\$^\\{\\circ\\}\$/g;
+ $result =~ s/°/\$^{\\circ}\$/g;
+ $result =~ s/°/\$^{\\circ}\$/g;
$result =~ s/±/\$\\pm\$/g;
$result =~ s/±/\$\\pm\$/g;
$result =~ s/²/\$^2\$/g;
@@ -626,6 +678,9 @@ sub character_chart {
return $result;
}
+
+#'"`
+
sub additional_cleanup {
my $result = shift;
my $first_app = index($result,'\documentclass',0);
@@ -672,10 +727,10 @@ sub content_map {
$_ = $chunk;
m/to=\"(\d+)\"/;
push @number_seq,$1;
- $startlink = index($map_string,'from="'.$1.'"',$startlink);
+ $startlink = index($map_string,'from="'.$1.'"',0);
$startlink = rindex($map_string,'<link ',$startlink);
}
- my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);
+ my $stalink = index($map_string,' to="'.$number_seq[0].'"',0);
while ($stalink != -1) {
$startlink = rindex($map_string,'<link ',$stalink);
$endlink = index($map_string,'</link>',$startlink);