[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
sakharuk
lon-capa-cvs@mail.lon-capa.org
Mon, 05 May 2003 20:14:32 -0000
sakharuk Mon May 5 16:14:32 2003 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
st of files from the subdirectory now can be seen on the screen.CVS: ----------------------------------------------------------------------
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.150 loncom/interface/lonprintout.pm:1.151
--- loncom/interface/lonprintout.pm:1.150 Mon May 5 14:48:15 2003
+++ loncom/interface/lonprintout.pm Mon May 5 16:14:32 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.150 2003/05/05 18:48:15 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.151 2003/05/05 20:14:32 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1349,15 +1349,6 @@
$laystyle='book';
}
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns);
-
-
-
-
-# my $choice = $ENV{'form.choice'};
-# my $layout = $ENV{'form.layout'};
-# my $numberofcolumns = $ENV{'form.numberofcolumns'};
-# my $papersize = $ENV{'form.papersize'};
-# my $laystyle = 'book';
my $assignment = $ENV{'form.assignment'};
# if ($choice eq 'Subdirectory print') {
# if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
@@ -1482,10 +1473,7 @@
my $fullname = &get_name($username,$userdomain);
#goes through all resources, checks if they are available for current student, and produces output
foreach my $curresline (@master_seq) {
-# my ($curres,$symb) = split /&&/, $curresline;
-# if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
-# my ($map,$id,$res_url) = split(/___/,$symb);$curresres
my ($map,$id,$res_url) = split(/___/,$curresline);
if (&Apache::lonnet::allowed('bre',$res_url)) {
my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
@@ -1517,31 +1505,26 @@
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= '\end{document}';
&Apache::lonnet::delenv('form.textwidth');
-# } elsif ($choice eq 'Subdirectory print') {
-# #prints selected problems from the subdirectory
-# $selectionmade = 6;
-# my @list_of_files = ();
-# for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
-# if ($ENV{'form.whattoprint'.$i}=~/^\//) {
-# push @list_of_files,$ENV{'form.whattoprint'.$i};
-# }
-# }
-# my $flag_latex_header_remove = 'NO';
-# for (my $i=0;$i<=$#list_of_files;$i++) {
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {
+ #prints selected problems from the subdirectory
+ $selectionmade = 6;
+ 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 %moreenv;
-# $moreenv{'form.grade_target'}='tex';
-# $moreenv{'form.textwidth'}=$LaTeXwidth;
-# &Apache::lonnet::appenv(%moreenv);
+ 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);
-# &Apache::lonnet::delenv('form.grade_target','form.textwidth');
-# #this chunck is responsible for printing the path to problem
+ &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) {
@@ -1569,7 +1552,7 @@
# $result .= $texversion;
# }
# $flag_latex_header_remove = 'YES';
-# }
+ }
# $result .= '\end{document}';
}
#-------------------------------------------------------- corrections for the different page formats
@@ -1758,6 +1741,7 @@
# "Delete everything after the last slash."
$subdir =~ s|/[^/]+$||;
+ $subdir = '/home/httpd/html/res'.$subdir.'/';
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.