version 1.202, 2003/07/10 20:39:08
|
version 1.208.2.1, 2003/08/13 19:52:05
|
Line 465 sub page_format {
|
Line 465 sub page_format {
|
sub get_name { |
sub get_name { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
if (!defined($uname)) { $uname=$ENV{'user.name'}; } |
if (!defined($uname)) { $uname=$ENV{'user.name'}; } |
if (!defined($udom)) { $uname=$ENV{'user.domain'}; } |
if (!defined($udom)) { $udom=$ENV{'user.domain'}; } |
my $plainname=&Apache::loncommon::plainname($uname,$udom); |
my $plainname=&Apache::loncommon::plainname($uname,$udom); |
if ($plainname=~/^\s*$/) { $plainname=$uname; } |
if ($plainname=~/^\s*$/) { $plainname=$uname; } |
return &Apache::lonxml::latex_special_symbols($plainname,undef,undef, |
return &Apache::lonxml::latex_special_symbols($plainname,undef,undef, |
Line 619 ENDPART
|
Line 619 ENDPART
|
$currentURL=$helper->{'VARS'}->{'filename'}; |
$currentURL=$helper->{'VARS'}->{'filename'}; |
$currentURL=~s/\/home\//\/~/; |
$currentURL=~s/\/home\//\/~/; |
$currentURL=~s/public_html\///; |
$currentURL=~s/public_html\///; |
|
if ($currentURL=~/([^?]+)/) {$currentURL=$1;} |
} |
} |
$selectionmade = 1; |
$selectionmade = 1; |
if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { |
if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { |
Line 627 ENDPART
|
Line 628 ENDPART
|
my %form; |
my %form; |
$form{'grade_target'}='tex'; |
$form{'grade_target'}='tex'; |
$form{'textwidth'}=$LaTeXwidth; |
$form{'textwidth'}=$LaTeXwidth; |
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
|
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; |
my $rndseed=time; |
my $rndseed=time; |
$form{'rndseed'}=$rndseed; |
$form{'rndseed'}=$rndseed; |
&Apache::lonnet::appenv(%moreenv); |
&Apache::lonnet::appenv(%moreenv); |
Line 649 ENDPART
|
Line 651 ENDPART
|
($result,$number_of_columns) = &page_cleanup($result); |
($result,$number_of_columns) = &page_cleanup($result); |
} |
} |
} else { |
} else { |
# $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: '; |
$result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: '; |
# if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { |
if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { |
# $result.=$1; |
$result.=$1; |
# } else { |
} elsif ($currentURL=~/\/ext\//) { |
# $result.=$ENV{'form.url'}; |
$result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' '; |
# } |
} else { |
# $result.=' \end{document}' |
$result.=$currentURL; |
|
} |
|
$result.=' \end{document}' |
} |
} |
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or |
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or |
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or |
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or |
Line 665 ENDPART
|
Line 669 ENDPART
|
$form{'grade_target'}='tex'; |
$form{'grade_target'}='tex'; |
$form{'textwidth'}=$LaTeXwidth; |
$form{'textwidth'}=$LaTeXwidth; |
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
|
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; |
my $flag_latex_header_remove = 'NO'; |
my $flag_latex_header_remove = 'NO'; |
my $flag_page_in_sequence = 'NO'; |
my $flag_page_in_sequence = 'NO'; |
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; |
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; |
Line 756 ENDPART
|
Line 761 ENDPART
|
if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { |
if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { |
my %form; |
my %form; |
$form{'answer_output_mode'}='tex'; |
$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); |
my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form); |
$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; |
$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; |
} |
} |
Line 805 ENDPART
|
Line 811 ENDPART
|
my %form; |
my %form; |
$form{'grade_target'}='answer'; |
$form{'grade_target'}='answer'; |
$form{'answer_output_mode'}='tex'; |
$form{'answer_output_mode'}='tex'; |
|
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; |
$form{'rndseed'}=$rndseed; |
$form{'rndseed'}=$rndseed; |
my $answer=&Apache::lonnet::ssi($urlp,%form); |
my $answer=&Apache::lonnet::ssi($urlp,%form); |
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; |
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; |
Line 896 sub handler {
|
Line 903 sub handler {
|
|
|
my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); |
my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); |
|
|
my $key; |
# my $key; |
# foreach $key (keys %parmhash) { |
# foreach $key (keys %parmhash) { |
# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />'); |
# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />'); |
# } |
# } |
Line 951 sub printHelper {
|
Line 958 sub printHelper {
|
# This will persistently load in the data we want from the |
# This will persistently load in the data we want from the |
# very first screen. |
# very first screen. |
# Detect whether we're coming from construction space |
# Detect whether we're coming from construction space |
if ($ENV{'form.postdata'} =~ /http:\/\// ) { |
if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) { |
$ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/; |
|
$helper->{VARS}->{'filename'} = "/home/$1/public_html/$2"; |
$helper->{VARS}->{'filename'} = "/home/$1/public_html/$2"; |
$helper->{VARS}->{'construction'} = 1; |
$helper->{VARS}->{'construction'} = 1; |
} else { |
} else { |
Line 1103 HELPERFRAGMENT
|
Line 1109 HELPERFRAGMENT
|
</resource> |
</resource> |
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message> |
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message> |
<choices variable="EMPTY_PAGES"> |
<choices variable="EMPTY_PAGES"> |
<choice computer='0'>Start each student\'s assignment on a new page (add a pagefeed after each assignment)</choice> |
<choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice> |
<choice computer='1'>Add one empty page after each student\'s assignment</choice> |
<choice computer='1'>Add one empty page/column after each student\'s assignment</choice> |
<choice computer='2'>Add two empty pages after each student\'s assignment</choice> |
<choice computer='2'>Add two empty pages/column after each student\'s assignment</choice> |
|
<choice computer='3'>Add three empty pages/column after each student\'s assignment</choice> |
</choices> |
</choices> |
</state> |
</state> |
CHOOSE_STUDENTS |
CHOOSE_STUDENTS |
Line 1126 CHOOSE_FROM_SUBDIR
|
Line 1133 CHOOSE_FROM_SUBDIR
|
|
|
$xmlfrag .= <<'CHOOSE_FROM_SUBDIR'; |
$xmlfrag .= <<'CHOOSE_FROM_SUBDIR'; |
<filefilter>return $filename =~ |
<filefilter>return $filename =~ |
m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/; |
m/\.(problem|exam|quiz|assess|survey|form|library)$/; |
</filefilter> |
</filefilter> |
</files> |
</files> |
</state> |
</state> |
Line 1158 CHOOSE_FROM_SUBDIR
|
Line 1165 CHOOSE_FROM_SUBDIR
|
['Print with answers', 'no'] ]; |
['Print with answers', 'no'] ]; |
Apache::lonhelper::choices->new(); |
Apache::lonhelper::choices->new(); |
} |
} |
|
if ($ENV{'request.role.adv'}) { |
|
$paramHash = Apache::lonhelper::getParamHash(); |
|
$paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:</i></b></big><br />"; |
|
Apache::lonhelper::message->new(); |
|
$paramHash = Apache::lonhelper::getParamHash(); |
|
$paramHash->{'variable'} = 'LATEX_TYPE'; |
|
$helper->declareVar('LATEX_TYPE'); |
|
if ($helper->{VARS}->{'construction'} eq '1') { |
|
$paramHash->{CHOICES} = [ |
|
['Print in standard LaTeX mode', 'standard'], |
|
['Print in LaTeX batchmode', 'batchmode'], ]; |
|
} else { |
|
$paramHash->{CHOICES} = [ |
|
['Print in LaTeX batchmode', 'batchmode'], |
|
['Print in standard LaTeX mode', 'standard'] ]; |
|
} |
|
Apache::lonhelper::choices->new(); |
|
} |
|
|
Apache::lonprintout::page_format_state->new("FORMAT"); |
Apache::lonprintout::page_format_state->new("FORMAT"); |
|
|