--- loncom/interface/lonprintout.pm 2003/06/24 14:07:27 1.194 +++ loncom/interface/lonprintout.pm 2003/06/25 18:34:14 1.198 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.194 2003/06/24 14:07:27 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.198 2003/06/25 18:34:14 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -602,8 +602,8 @@ ENDPART $selectionmade = 4; } $form{'symb'}=$master_seq[$i]; - $master_seq[$i]=~/\/([^\/]+)\.sequence_/; - my $assignment=' '.$1.' '; + $master_seq[$i]=~/(.*)___\d*___/; + my $assignment=&Apache::lonnet::gettitle($1); #tittle of the assignment which contains this problem #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -625,7 +625,7 @@ ENDPART $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; } # $result .= $texversion; - if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>1)) { + if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) { my $name = &get_name(); if ($name =~ /^\s*$/) { $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef, @@ -657,6 +657,8 @@ ENDPART # my ($usersection,$username,$userdomain) = split /:/,$person; my ($username,$userdomain) = split /:/,$person; my $fullname = &get_name($username,$userdomain); + + if ($parmhash{'anonymous_quiz'}=~/yes/) {$fullname=' ';} #put here something reasonable for anonymous exams or quiz #goes through all resources, checks if they are available for current student, and produces output foreach my $curresline (@master_seq) { if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) { @@ -761,12 +763,12 @@ ENDPART $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'}); $result = &latex_corrections($number_of_columns,$result); #changes page's parameters for the one column output -# if ($numberofcolumns == 1) { -# $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/; -# $result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/; -# $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/; -# $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/; -# } + if ($numberofcolumns == 1) { + $result =~ s/\\textwidth= 9cm/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /; + $result =~ s/\\textheight 25\.9cm/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /; + $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; + $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; + } #-- writing .tex file in prtspool my $temp_file; my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";