--- loncom/interface/lonprintout.pm 2002/08/09 18:06:46 1.48
+++ loncom/interface/lonprintout.pm 2002/08/30 20:41:09 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.48 2002/08/09 18:06:46 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.52 2002/08/30 20:41:09 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,6 +47,7 @@ use Apache::inputtags;
use Apache::edit;
use Apache::File();
use POSIX qw(strftime);
+use Apache::loncoursedata;
sub headerform {
@@ -73,13 +74,18 @@ sub menu_for_output {
(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);
+ $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 />
ENDMENUOUT2
}
+ if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {
+ $r->print(<<ENDMENUOUT6);
+ <input type="radio" name="choice" value="All class print"> Print assignment for students in class<br />
+ENDMENUOUT6
+ }
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
@@ -114,13 +120,59 @@ ENDMENUOUT4
</table>
</br>
<input type="submit" value="Submit your choice">
-</form>
-</body>
-</html>
ENDMENUOUT5
}
+sub additional_class_menu {
+ my $r = shift;
+ $r->print(<<ENDMENUOUT1);
+<input type="hidden" name="url" value="$ENV{'form.url'}">
+<input type="hidden" name="choice" value="$ENV{'form.choice'}">
+<input type="hidden" name="layout" value="$ENV{'form.layout'}">
+<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+<h1>Mark students which assignments you want to print</h1>
+ENDMENUOUT1
+ my $c = $r->connection;
+ my %cache;
+ my $courseID=$ENV{'request.course.id'};
+ my $classlist=&Apache::loncoursedata::DownloadClasslist($courseID,
+ $cache{'ClasslistTimestamp'},
+ $c);
+ foreach (keys(%$classlist)) {
+ if(/^(con_lost|error|no_such_host)/i) {
+ untie(%cache);
+ return "Error getting student data.";
+ }
+ }
+ my $classlistaa = '';
+ foreach my $st (keys(%$classlist)) {
+ $classlistaa .= ' SSS '.$st.' => '.$$classlist{$st}.' FFF '."\r\n";
+ }
+
+ $r->print(<<ENDMENUOUT2);
+ $classlistaa <br />
+<input type="hidden" name="phase" value="three">
+<input type="submit" value="Submit">
+ENDMENUOUT2
+}
+
+
+sub additional_print_menu {
+ my $r = shift;
+ $r->print(<<ENDMENUOUT);
+<input type="hidden" name="url" value="$ENV{'form.url'}">
+<input type="hidden" name="choice" value="$ENV{'form.choice'}">
+<input type="hidden" name="layout" value="$ENV{'form.layout'}">
+<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+Enter width of the page: <input type="text" name="width" width="10" value="9cm"> <br />
+<input type="hidden" name="phase" value="four">
+<input type="submit" value="Submit">
+</form>
+</body>
+</html>
+ENDMENUOUT
+}
sub output_data {
@@ -140,7 +192,6 @@ ENDPART
my $laystyle = 'book';
my $result = '';
my $number_of_columns = 1;
-# my $number_of_columns = $ENV{'form.numberofcolumns'};
if ($choice eq 'Standard LaTeX output for current document') {
#-- single document - problem, page, html, xml
@@ -196,8 +247,6 @@ 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?
my $main_seq = '/res/'.$ENV{'request.course.uri'};
my $file=&Apache::lonnet::filelocation("",$main_seq);
@@ -206,85 +255,63 @@ ENDPART
for (my $iu=0;$iu<=$#file_seq;$iu++) {
$file_seq[$iu]=~s/^"//;
$file_seq[$iu]=~s/"$//;
- $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
-#remove $result .= ' SSS '.$file_seq[$iu].' FFF ';
+ 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) {
+ 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);
- $result .=' START '.$i.' LOOK '.$filecontents.' FINISH ';
-# splice @file_seq,$1,1,@newfile_seq;
-# $i=-1;
+ 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,$1,1;
+ splice @file_seq,$i,1,'REMOVE IT PLEASE';
}
}
-
-
-
-
$i++;
}
for (my $iu=0;$iu<=$#file_seq;$iu++) {
- $result .= ' SSS '.$file_seq[$iu].' FFF ';
+ 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<=$#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);
+ my $texversion=&Apache::lonnet::ssi($urlp);
+ &Apache::lonnet::delenv('form.grade_target');
+ $result .= $texversion;
+ }
+ }
+ $result = &additional_cleanup($result);
+ } elsif ($choice eq 'All class print') {
- # do we have any other sequence inside?
-# $result.=$#file_seq.' ';
-## my $i=1;
-## while ($i<=$#file_seq) {
-# $result.=' '.$file_seq[$i].' ';
-## $file_seq[$i]=~s/^"//;
-## $file_seq[$i]=~s/"$//;
-## if ($file_seq[$i]=~m/\.sequence\s*$/) {
-## $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
-# $result.=' location '.$file.' ';
-# $result .= 'FFFFFFFFF'.$file.' ';
-## $filecontents=&Apache::lonnet::getfile($file);
-## @add_file_seq = &content_map($filecontents);
-
-#
-# for (my $iu=0;$iu<=$#add_file_seq;$iu++) {
-# $result .= ' SDSD '.$add_file_seq[$iu].' FDFD ';
-# }
-#
-
-## splice(@file_seq,$i,1,@add_file_seq);
-## @add_file_seq = ();
-## $i = -1;
-## }
-## $i++;
-## last; #do not forget to remove
-## }
-## @master_seq = @file_seq;
-
-#
-# for (my $iu=0;$iu<=$#file_seq;$iu++) {
-# $result .= ' SSS '.$file_seq[$iu].' FFF ';
-# }
-#
-
-#-- 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)/) {
-### my %moreenv;
-### $moreenv{'form.grade_target'}='tex';
-### &Apache::lonnet::appenv(%moreenv);
-### my $texversion=&Apache::lonnet::ssi($urlp);
-### &Apache::lonnet::delenv('form.grade_target');
-### $result .= $texversion;
-### }
-### }
-### $result = &additional_cleanup($result);
} elsif ($choice eq 'Subdirectory print') {
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
@@ -322,11 +349,7 @@ ENDPART
}
$result = &additional_cleanup($result);
-
-
-
-
-
+
}
#-- corrections for the different page formats
if ($layout eq 'CBI' and $numberofcolumns eq '1') {
@@ -344,12 +367,16 @@ 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;
$result =~ s/\$number_of_columns/$number_of_columns/g;
}
+ #changes page's parameters for the one column output
+ if ($ENV{'form.numberofcolumns'} == 1) {
+ $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
+ }
#-- LaTeX corrections
my $first_comment = index($result,'<!--',0);
while ($first_comment != -1) {
@@ -358,7 +385,6 @@ ENDPART
$first_comment = index($result,'<!--',$first_comment);
}
$result =~ s/^\s+$//gm; #remove empty lines
- $result =~ s/\s%/\\%/g; #corrects %
$result =~ s/(\s)+/$1/g; #removes more than one empty space
$result =~ s/\\\\\s*\\vskip/\\vskip/gm;
$result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
@@ -381,7 +407,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
@@ -812,8 +838,24 @@ sub handler {
unless ($ENV{'form.phase'}) {
&menu_for_output($r);
}
+#-- additional menu for class printing
+ if ($ENV{'form.phase'} eq 'two') {
+ if($ENV{'form.choice'} eq 'All class print') {
+ &additional_class_menu($r);
+ } else {
+ $ENV{'form.phase'} = 'three';
+ }
+ }
+#-- additional menu for page layout (one column case)
+ if ($ENV{'form.phase'} eq 'three') {
+ if($ENV{'form.numberofcolumns'} == 1) {
+ &additional_print_menu($r);
+ } else {
+ $ENV{'form.phase'} = 'four';
+ }
+ }
#-- core part
- if ($ENV{'form.phase'} eq 'two') {
+ if ($ENV{'form.phase'} eq 'four') {
&output_data($r);
}
return OK;