--- loncom/interface/lonprintout.pm 2002/05/21 00:44:03 1.30
+++ loncom/interface/lonprintout.pm 2002/07/01 20:56:20 1.36
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.30 2002/05/21 00:44:03 albertel Exp $
+# $Id: lonprintout.pm,v 1.36 2002/07/01 20:56:20 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,7 +46,7 @@ use Apache::lonnet;
use Apache::inputtags;
use Apache::edit;
use Apache::File();
-
+use POSIX qw(strftime);
sub headerform {
@@ -75,16 +75,29 @@ sub menu_for_output {
All problems from the top level sequence
ENDMENUOUT1
- if ($ENV{'user.adv'} eq '1') {
+ my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+ $subdirtoprint =~ s/\/[^\/]+$//;
+ if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
$r->print(< All problems from particular subdirectory
+ All problems from current subdirectory (where this particular problem is)
ENDMENUOUT2
- }
- $r->print(<print(<
And what page format do you prefer?
- Two columns landscape
- Two columns portrait
+
+
+
+ Landscape
+ Portrait
+
+
+
+ Number of columns:
+
+
+
+
@@ -108,44 +121,41 @@ ENDPART
my $choice = $ENV{'form.choice'};
my $layout = $ENV{'form.layout'};
- my $subdirtoprint = $ENV{'form.subdirect'};
+ my $numberofcolumns = $ENV{'form.numberofcolumns'};
my $laystyle = 'book';
my $result = '';
- my %mystyle;
- my $filename;
-
+ my $number_of_columns = 1;
+
if ($choice eq 'Standard LaTeX output for current document') {
+ #-- single document - problem, page, html, xml
my %moreenv;
- my $currequest=$ENV{'request.filename'};
$moreenv{'form.grade_target'}='tex';
$moreenv{'request.filename'}=$ENV{'form.url'};
&Apache::lonnet::appenv(%moreenv);
my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
&Apache::lonnet::delenv('form.grade_target');
- %moreenv = ();
- $moreenv{'request.filename'}=$currequest;
- &Apache::lonnet::appenv(%moreenv);
$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') {
-#-- where is the primary sequence containing file?
- my %moreenv;
+ #-- minimal sequence to which the current document belongs
+ #-- where is the primary sequence containing file?
my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
$_ = $symbolic;
m/([^_]+)_/;
my $primary_sequence = '/res/'.$1;
-#-- open and analyses the primary sequence
+ #-- open and analyses the primary sequence
my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
my @master_seq = &content_map($sequencefilecontents);
-#-- produce an output string
+ #-- produce an output string
for (my $i=0;$i<=$#master_seq;$i++) {
$_ = $master_seq[$i];
m/\"(.*)\"/;
$_ = $1;
- my $urlp = $1;
+ my $urlp = $1;
if ($choice eq 'Standard LaTeX output for the primary sequence') {
- if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
+ if ($urlp =~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
my %moreenv;
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
@@ -154,6 +164,7 @@ ENDPART
$result .= $texversion;
}
} else {
+ my %moreenv;
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
my $texversion=&Apache::lonnet::ssi($urlp);
@@ -201,46 +212,42 @@ ENDPART
}
}
$result = &additional_cleanup($result);
- } elsif ($choice eq 'Subdirectory print') {
- if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
- my $locald = &Apache::lonnet::filelocation("",$subdirtoprint);
- unless (-e $locald) {
-#do something in the case of the absence of this subdirectory on the local mashine
-#replication process
- }
- my @list_of_files = ();
- my @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];
- }
- }
- for (my $i=0;$i<=$#list_of_files;$i++) {
- $subdirtoprint =~ s/\/$//;
- my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
- my %moreenv;
- $moreenv{'form.grade_target'}='tex';
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($urlp);
- &Apache::lonnet::delenv('form.grade_target');
- $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
- $result .= $texversion;
+ } elsif ($choice eq 'Subdirectory print') {
+ 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);
+ 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];
}
- $result = &additional_cleanup($result);
-
- } else {
-#message "you not allowed to do this"
}
+ $localdirectory =~ s/\/$//;
+ for (my $i=0;$i<=$#list_of_files;$i++) {
+ my $urlp = $localdirectory.'/'.$list_of_files[$i];
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ &Apache::lonnet::appenv(%moreenv);
+ my $texversion=&Apache::lonnet::ssi($urlp);
+ &Apache::lonnet::delenv('form.grade_target');
+ $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
+ $result .= $texversion;
+ }
+ $result = &additional_cleanup($result);
+
+
-
-
+
}
#-- corrections for the different page formats
- if ($layout eq 'CBI') {
+ if ($layout eq 'CBI' and $numberofcolumns eq '1') {
+ } elsif ($layout eq 'CBI' and $numberofcolumns eq '2') {
$result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;
$laystyle = 'album';
} elsif ($layout eq 'CAPA') {
@@ -248,10 +255,13 @@ ENDPART
$_ = $courseidinfo;
m/.*\/(.*)/;
$courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
- $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
- $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
+# $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
+ $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass{article}/;
+ $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 9cm\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo} \\vskip 5 mm /;
$result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/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{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;
+ $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
}
#-- LaTeX corrections
my $first_comment = index($result,'