--- loncom/interface/lonprintout.pm 2003/10/02 15:33:03 1.247
+++ loncom/interface/lonprintout.pm 2003/10/20 17:38:51 1.256
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.247 2003/10/02 15:33:03 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.256 2003/10/20 17:38:51 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,17 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1 Gerd Kortemeyer
-#
-# 9/17 Alex Sakharuk
#
package Apache::lonprintout;
@@ -51,6 +40,7 @@ use Apache::File();
use Apache::lonnavmaps;
use Apache::lonratedt;
use POSIX qw(strftime);
+use Apache::lonlocal;
use GDBM_File;
@@ -656,6 +646,8 @@ sub path_to_problem {
}
}
}
+ } else {
+ $newurlp=$urlp;
}
return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
}
@@ -786,8 +778,9 @@ ENDPART
$form{'rndseed'}=$rndseed;
$texversion=&Apache::lonnet::ssi($urlp,%form);
}
- if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
- ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
+ ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
@@ -835,7 +828,8 @@ ENDPART
}
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
- ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) {
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) {
#-- produce an output string
my %form=();
$form{'grade_target'}='tex';
@@ -857,6 +851,8 @@ ENDPART
$selectionmade = 3;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
$selectionmade = 4;
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
+ $selectionmade = 7;
}
$form{'symb'}=$master_seq[$i];
my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
@@ -879,10 +875,14 @@ ENDPART
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
} else {
- $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
- $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
- $texversion.='\vskip 1 mm '.$answer;
+ if ($urlp=~/\.(problem|exam|quiz|library)$/) {
+ $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm ';
+ $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
+ $texversion.='\vskip 1 mm '.$answer;
+ } else {
+ $texversion='';
+ }
}
}
if ($flag_latex_header_remove ne 'NO') {
@@ -906,9 +906,13 @@ ENDPART
&Apache::lonnet::delenv('form.counter');
if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
$result .= '\end{document}';
- } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
+ } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) {
#-- prints assignments for whole class or for selected students
- $selectionmade=5;
+ if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
+ $selectionmade=5;
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
+ $selectionmade=8;
+ }
my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
#loop over students
@@ -928,22 +932,30 @@ ENDPART
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
foreach my $curresline (@master_seq) {
- if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ if ((($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) && ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students')) || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) {
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
if (&Apache::lonnet::allowed('bre',$res_url)) {
my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
$ENV{'request.course.id'},'tex');
- if ($flag_latex_header_remove eq 'YES') {
- $rendered = &latex_header_footer_remove($rendered);
- } else {
- $rendered =~ s/\\end{document}//;
- }
- if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
my %form;
$form{'answer_output_mode'}='tex';
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
- $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+ if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+ } else {
+ $rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ $rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
+ $rendered.=&path_to_problem ($curresline,$LaTeXwidth);
+ $rendered.='\vskip 1 mm '.$ansrendered;
+ }
+ }
+ if ($flag_latex_header_remove eq 'YES') {
+ $rendered = &latex_header_footer_remove($rendered);
+ } else {
+ $rendered =~ s/\\end{document}//;
}
$current_output .= $rendered;
}
@@ -964,7 +976,7 @@ ENDPART
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student '.$fullname);
+ &mt('last student').' '.$fullname);
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= '\end{document}';
@@ -981,6 +993,7 @@ ENDPART
}
for (my $i=0;$i<=$#list_of_files;$i++) {
my $urlp = $list_of_files[$i];
+ $urlp=~s|//|/|;
if ($urlp=~/\//) {
my %form;
$form{'grade_target'}='tex';
@@ -992,17 +1005,34 @@ ENDPART
$urlp =~ s|^/home/httpd/html||;
}
my $texversion=&Apache::lonnet::ssi($urlp,%form);
- if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'rndseed'}=$rndseed;
my $answer=&Apache::lonnet::ssi($urlp,%form);
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ } else {
+ $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ if ($helper->{'VARS'}->{'construction'} ne '1') {
+ $texversion.='\vskip 0 mm \noindent ';
+ $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
+ } else {
+ $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
+ my $URLpath=$urlp;
+ $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+ $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+ }
+ $texversion.='\vskip 1 mm '.$answer.'\end{document}';
+ }
}
#this chunck is responsible for printing the path to problem
- my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
+ my $newurlp=$urlp;
+ if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
+ $newurlp=&path_to_problem($newurlp,$LaTeXwidth);
$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
@@ -1044,11 +1074,22 @@ ENDPART
unless ($temp_file = Apache::File->new('>'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
return SERVER_ERROR;
- }
+ }
+
+########
+ my $identifier = time.'_'.int(rand(1000));
+ &Apache::lonnet::appenv($identifier.'.file' => $filename,
+ $identifier.'.layout' => $laystyle,
+ $identifier.'.numcol' => $numberofcolumns,
+ $identifier.'.selection' => $selectionmade);
+
+##
+########
+
print $temp_file $result;
$r->print(<
+