--- loncom/interface/lonprintout.pm 2003/05/13 15:28:32 1.164 +++ loncom/interface/lonprintout.pm 2003/07/01 20:15:06 1.201 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.164 2003/05/13 15:28:32 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.201 2003/07/01 20:15:06 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,737 +56,6 @@ use GDBM_File; my %hash; my $LaTeXwidth = 0; -sub headerform { - my $r = shift; - $r->print(< - -LON-CAPA output for printing - - -
-ENDHEADER - - if ($ENV{'form.postdata'}=~m|^/res/|) { - $r->print(<Path to current document: $ENV{'form.postdata'}

-ENDHEADER1 - } -} - - -sub menu_for_output { - my $r = shift; - my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu; - my $assignment = $title_for_sequence; - if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';} - if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';} - if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';} - $ENV{'form.postdata'} =~ s|http://[^/]+||; - my $subdir_to_print = $ENV{'form.postdata'}; - $subdir_to_print =~ m/\/([^\/]+)$/; - $subdir_to_print =~ s/\Q$1\E//; - $r->print(<What do you want to print? Make a choice.
- - - - Current document $title_for_single_resource -(prints what you just saw on the screen)
-ENDMENUOUT1 - if ($ENV{'form.postdata'}=~/\/res\//) { - $r->print(< Problem(s) from $title_for_sequence
- Problem(s) plus page(s) or html/xml file(s) from $title_for_sequence
-ENDMENUOUT2 - } - if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { - $r->print(< All problems in this course (warning: this may be time consuming)
-
- All problems from $title_for_sequence for selected students

-ENDMENUOUT6 - } - my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'}); - $subdirtoprint =~ s/\/[^\/]+$//; - if ((&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) { - $r->print(< Problems from current subdirectory $subdir_to_print
-ENDMENUOUT4 - } - $r->print(<


-

And what page format do you prefer?

- - - - - - - - -
- Landscape
- Portrait
- 		  - Number of columns: - - Paper size (format [width x height]): -
-
- -ENDMENUOUT5 -} - - -sub sequence_content_menu { - my ($key_to,$r) = @_; - my $primary_sequence; - my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); - my @sequence = split('___',$symbolic); - $primary_sequence=&Apache::lonnet::clutter($sequence[0]); - my @master_seq = &coming_from_hash($primary_sequence); - my @titles_master_seq = (); - for (my $i=0;$i<=$#master_seq;$i++) { - my ($path,$title,$symb) = split /&&/,$master_seq[$i]; - $master_seq[$i] = $path.'&&'.$symb; - push @titles_master_seq, $title; - } - my @master_seq_view = @master_seq; - if ($ENV{'user.adv'}) { - for (my $i=0;$i<=$#master_seq_view;$i++) { - $master_seq_view[$i]=~/___\d+___(.+)$/; - $master_seq_view[$i]='/'.$1; - } - } else { - for (my $i=0;$i<=$#master_seq_view;$i++) { - $master_seq_view[$i]=' '; - } - } - $r->print(< - - - - - -

Mark item(s) which you want to print

- - -  -  - -

-ENDMENUOUT1 - my $inc=0; - for (my $i=0;$i<=$#master_seq_view;$i++) { - if ($key_to==1 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { - $r->print('
'."\n".''. - $titles_master_seq[$i].'   '.$master_seq_view[$i].''); - $inc++; - } elsif ($key_to==0 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) { - $r->print('
'."\n".''. - $titles_master_seq[$i].'   '.$master_seq_view[$i].''); - $inc++; - } - } - $r->print(<
- - -  -  - -ENDMENUOUT2 - -} - - -sub problem_choice_menu { - my $r = shift; - my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'}); - $subdirtoprint =~ s/\/[^\/]+$//; - my @list_of_files = (); - my @content_directory = (); - $r->print("Subdir: " . $subdirtoprint . "
"); - if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) { - #localmachine CSTR space - my $user=$1; - my $domain=$Apache::lonnet::perlvar{'lonDefDomain'}; - @content_directory = &Apache::lonnet::dirlist($subdirtoprint, - $domain, $user,''); - } else { - #local library server res space (allows to print only from the own library server) - @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},''); - } - for (my $iy=0;$iy<=$#content_directory;$iy++) { - my @tempo_array = split(/&/,$content_directory[$iy]); - if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) { - push(@list_of_files,$tempo_array[0]); - } - } - $subdirtoprint =~ s/\/$//; - for (my $i=0;$i<=$#list_of_files;$i++) { - $list_of_files[$i] = $subdirtoprint.'/'.$list_of_files[$i]; - } - $r->print(< - - - -

Mark problems which you want to print

- -  -  - -

-ENDMENUOUT1 - my $i=0; - foreach my $file (sort @list_of_files) { - $r->print('
'. - $file); - $i++; - } - $r->print(<
- - - -  -  - -ENDMENUOUT2 -} - - -sub additional_class_menu { - my $r = shift; - $r->print(< - - - - -

Select student(s) whose assignment you want to print

-ENDMENUOUT1 - my %courselist=&Apache::lonnet::dump( - 'classlist', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - my $now=time; - $r->print(< - function checkall() { - for (i=0; i -  - -  - -

-ENDDISHEADER - my $i = 0; - foreach (sort keys %courselist) { - my ($end,$start)=split(/\:/,$courselist{$_}); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - my ($sname,$sdom)=split(/\:/,$_); - my %reply=&Apache::lonnet::get('environment', - ['firstname','middlename','lastname','generation'], - $sdom,$sname); - my $section=&Apache::lonnet::usection - ($sdom,$sname,$ENV{'request.course.id'}); - if ($section == -1) { $section = ''; } - $r->print( - '
'. - $reply{'firstname'}.' '. - $reply{'middlename'}.' '. - $reply{'lastname'}.' '. - $reply{'generation'}. - ' ('.$_.') '.$section); - $i++; - } - } - $r->print(<

-
Number of blank pages added to each student assignments to print these assignments on physically different sheets (requires manual addjustment):
-
- - - - -ENDMENUOUT2 -} - - -sub additional_print_menu { - my $r = shift; - my $what_to_print = ''; - for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) { - $what_to_print .= ''; - } - for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) { - $what_to_print .= ''; - } - for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) { - $what_to_print .= ''; - } - $r->print(< - - - - - - - - - -Define one column layout parameters:
-Width:
-Height:
-Left margin:
- - - - - -ENDMENUOUT -} - - -sub output_data { - my $r = shift; - $r->print(< - -LON-CAPA output for printing - - -

-ENDPART - - 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';} - if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';} - if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;} - } - if (($choice eq 'Standard LaTeX output for current document') && - ($ENV{'form.url'}=~m|^/~|)) { - if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';} - if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';} - if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;} - } - my $result = ''; - my $number_of_columns = 1; #used only for pages to determine the width of the cell - my $selectionmade = ''; - my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns); - if ($numberofcolumns == 1) { - $textwidth=$ENV{'form.width'}; - $textheight=$ENV{'form.height'}; - } - my $LaTeXwidth; - if ($textwidth=~/(\d+\s*cm)/) { - $LaTeXwidth = $1*10; - } elsif ($textwidth=~/(\d+\s*mm)/) { - $LaTeXwidth = $1; - } - if ($choice eq 'Standard LaTeX output for current document') { - #-- single document - problem, page, html, xml, ... - $selectionmade = 1; - if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) { - $ENV{'form.url'}=~s/http:\/\/[^\/]+//; - } - $moreenv{'request.filename'}=$ENV{'form.url'}; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($ENV{'form.url'}); - &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter'); - $result .= $texversion; - if ($ENV{'form.url'}=~m/\.page\s*$/) { - ($result,$number_of_columns) = &page_cleanup($result); - } - } else { - $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)$/) { - $result.=$1; - } else { - $result.=$ENV{'form.url'}; - } - $result.=' \end{document}' - } - } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or - $choice eq 'Standard LaTeX output for whole primary sequence') { - #-- minimal sequence to which the current document belongs - #-- where is the primary sequence containing file? - my @master_seq = (); - for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) { - if ($ENV{'form.whatfile'.$i}=~/\S/) { - push @master_seq,$ENV{'form.whatfile'.$i}; - } - } - #-- produce an output string - my $flag_latex_header_remove = 'NO'; - my $flag_page_in_sequence = 'NO'; - for (my $i=0;$i<=$#master_seq;$i++) { - my ($urlp,$symb) = split /&&/, $master_seq[$i]; - if ($choice eq 'Standard LaTeX output for the primary sequence') { - $selectionmade = 2; - } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') { - $selectionmade = 3; - } - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); - #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb"); - my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb)); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); - if ($urlp =~ m/\.page/) { - ($texversion,my $number_of_columns_page) = &page_cleanup($texversion); - if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} - $texversion =~ s/\\end{document}\d*/\\end{document}/; - $flag_page_in_sequence = 'YES'; - } - if ($flag_latex_header_remove ne 'NO') { - $texversion = &latex_header_footer_remove($texversion); - } else { - $texversion =~ s/\\end{document}//; - } - $result .= $texversion; - $flag_latex_header_remove = 'YES'; - } - &Apache::lonnet::delenv('form.counter'); - if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;} - $result .= '\end{document}'; - } elsif ($choice eq 'Standard LaTeX output for the top level sequence') { - # where is the main sequence of the course? - $selectionmade = 4; - my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'}); - my @file_seq = &coming_from_hash($main_seq); - for (my $i=0;$i<=$#file_seq;$i++) { - my ($path,$title,$symb) = split /&&/,$file_seq[$i]; - $file_seq[$i] = $path.'&&'.$symb; - } - my $flag_latex_header_remove = 'NO'; - #-- produce an output string - for (my $i=0;$i<=$#file_seq;$i++) { - if (not $file_seq[$i]=~/^&&/) { - my ($urlp,$symb) = split /&&/, $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'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb)); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); - if ($flag_latex_header_remove ne 'NO') { - $texversion = &latex_header_footer_remove($texversion); - } else { - $texversion =~ s/\\end{document}//; - } - $result .= $texversion; - $flag_latex_header_remove = 'YES'; - } - } - } - $result .= '\end{document}'; - } elsif ($choice eq 'All class print') { - #-- prints assignments for whole class or for selected students - $selectionmade = 5; - my @students = (); - for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) { - if ($ENV{'form.whomtoprint'.$i}=~/:/) { - push @students,$ENV{'form.whomtoprint'.$i}; - } - } - #where is the primary sequence containing current resource (the same for all students)? - my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); - my @sequence = split('___',$symbolic); - my $primary_sequence; - - $primary_sequence=&Apache::lonnet::clutter($sequence[0]); - my @master_seq = &coming_from_hash($primary_sequence); - for (my $i=0;$i<=$#master_seq;$i++) { - my ($path,$title,$symb) = split /&&/,$master_seq[$i]; - $master_seq[$i] = $path.'&&'.$symb; - } - #loop over students - my $flag_latex_header_remove = 'NO'; - my %moreenv; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1); - foreach my $person (@students) { - my $current_output = ''; - my ($usersection,$username,$userdomain) = split /:/,$person; - 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)/) { - my ($map,$id,$res_url) = split(/___/,$symb); - if (&Apache::lonnet::allowed('bre',$res_url)) { - my $rendered = &Apache::loncommon::get_student_view($symb,$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}//; - } - $current_output .= $rendered; - } - $flag_latex_header_remove = 'YES'; - } - } - my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; - if ($current_output=~/\\documentclass/) { - $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /; - } else { - my $blanspages = ''; - for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';} - $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output; - } - $result .= $current_output; - &Apache::lonnet::delenv('form.counter'); - &Apache::lonxml::init_counter(); - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student '.$fullname); - } - &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++) { - my $urlp = $list_of_files[$i]; - if ($urlp=~/\//) { - 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 - my $newurlp = ''; - my $HowMany = length($urlp)*2; - if ($HowMany > $LaTeXwidth) { - my @temporrary = split '/',$urlp; - my $HowManyNew = 0; - for (my $ii=0;$ii<=$#temporrary;$ii++) { - if ($temporrary[$ii] ne '') { - $HowManyNew += length($temporrary[$ii])*2; - if ($HowManyNew < $LaTeXwidth ) { - $newurlp .= '/'.$temporrary[$ii]; - } else { - $HowManyNew = 0; - $newurlp .= '|\vskip -1 mm \noindent \verb|'; - $ii--; - } - } - } - } - $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/; - if ($flag_latex_header_remove ne 'NO') { - $texversion = &latex_header_footer_remove($texversion); - } else { - $texversion =~ s/\\end{document}//; - } - $result .= $texversion; - } - $flag_latex_header_remove = 'YES'; - } - $result .= '\end{document}'; - } -#-------------------------------------------------------- corrections for the different page formats - $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result,$assignment); - if ($layout eq 'CBI') { - $laystyle = 'album'; - } - $result = &latex_corrections($number_of_columns,$result); - #changes page's parameters for the one column output - if ($ENV{'form.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'}/; - } -#-- writing .tex file in prtspool - my $temp_file; - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex"; - unless ($temp_file = Apache::File->new('>'.$filename)) { - $r->log_error("Couldn't open $filename for output $!"); - return SERVER_ERROR; - } - print $temp_file $result; -$r->print(< - - -FINALEND -} - - -sub coming_from_hash { - - my $mainsequence = shift; - my @resourcelist = (); - my $mapid = $hash{'map_pc_'.$mainsequence}; - my $mapstart = $hash{'map_start_'.$mainsequence}; - my $mapfinish = $hash{'map_finish_'.$mainsequence}; - my $current_resource = $mapstart; - while ($current_resource ne $mapfinish) { - if ($hash{'src_'.$current_resource}=~/\.sequence$/) { - push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource}); - } else { - my $presymb=&Apache::lonnet::declutter($mainsequence); - my $rid = $current_resource; - if ($rid=~/,/) { - my @rid = split /,/, $rid; - foreach my $rid_element (@rid) { - if ($rid_element =~ m/^$mapid\.(\d*)/) { - $rid = $1; - last; - } - } - } else { - $rid =~ m/^$mapid\.(\d*)/; - $rid = $1; - } - my $symb = $presymb.'___'.$rid.'___'. - &Apache::lonnet::declutter($hash{'src_'.$current_resource}); - push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb; - } - $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}}; - } - #needs if final resource in the map (type="finish") contains something - if ($hash{'src_'.$current_resource}=~/\.sequence$/) { - push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource}); - } else { - my $presymb=&Apache::lonnet::declutter($mainsequence); - my $rid = $current_resource; - if ($rid=~/,/) { - my @rid = split /,/, $rid; - foreach my $rid_element (@rid) { - if ($rid_element =~ m/^$mapid\.(\d*)/) { - $rid = $1; - last; - } - } - } else { - $rid =~ m/^$mapid\.(\d*)/; - $rid = $1; - } - my $symb = $presymb.'___'.$rid.'___'. - &Apache::lonnet::declutter($hash{'src_'.$current_resource}); - push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb; - } - $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}}; - return @resourcelist; -} - sub latex_header_footer_remove { my $text = shift; @@ -1017,6 +286,7 @@ sub character_chart { $result =~ s/&(mu|\#956);/\$\\mu \$/g; $result =~ s/&(nu|\#957);/\$\\nu \$/g; $result =~ s/&(xi|\#958);/\$\\xi \$/g; + $result =~ s/&(omicron|\#959);/o/g; $result =~ s/&(pi|\#960);/\$\\pi \$/g; $result =~ s/&(rho|\#961);/\$\\rho \$/g; $result =~ s/&(sigma|\#963);/\$\\sigma \$/g; @@ -1026,90 +296,93 @@ sub character_chart { $result =~ s/&(chi|\#967);/\$\\chi \$/g; $result =~ s/&(psi|\#968);/\$\\psi \$/g; $result =~ s/&(omega|\#969);/\$\\omega \$/g; + $result =~ s/&(thetasym|\#977);/\$\\vartheta \$/g; + $result =~ s/&(piv|\#982);/\$\\varpi \$/g; + $result =~ s/&(Alpha|\#913);/A/g; + $result =~ s/&(Beta|\#914);/B/g; $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g; $result =~ s/&(Delta|\#916);/\$\\Delta \$/g; + $result =~ s/&(Epsilon|\#917);/E/g; + $result =~ s/&(Zeta|\#918);/Z/g; + $result =~ s/&(Eta|\#919);/H/g; $result =~ s/&(Theta|\#920);/\$\\Theta \$/g; + $result =~ s/&(Iota|\#921);/I/g; + $result =~ s/&(Kappa|\#922);/K/g; $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g; + $result =~ s/&(Mu|\#924);/M/g; + $result =~ s/&(Nu|\#925);/N/g; $result =~ s/&(Xi|\#926);/\$\\Xi \$/g; + $result =~ s/&(Omicron|\#927);/O/g; $result =~ s/&(Pi|\#928);/\$\\Pi \$/g; + $result =~ s/&(Rho|\#929);/P/g; $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g; + $result =~ s/&(Tau|\#932);/T/g; $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g; $result =~ s/&(Phi|\#934);/\$\\Phi \$/g; + $result =~ s/&(Chi|\#935);/X/g; $result =~ s/&(Psi|\#936);/\$\\Psi \$/g; $result =~ s/&(Omega|\#937);/\$\\Omega \$/g; - +#Arrows (extended HTML 4.01) + $result =~ s/&(larr|\#8592);/\$\\leftarrow \$/g; + $result =~ s/&(uarr|\#8593);/\$\\uparrow \$/g; + $result =~ s/&(rarr|\#8594);/\$\\rightarrow \$/g; + $result =~ s/&(darr|\#8595);/\$\\downarrow \$/g; + $result =~ s/&(harr|\#8596);/\$\\leftrightarrow \$/g; + $result =~ s/&(lArr|\#8656);/\$\\Leftarrow \$/g; + $result =~ s/&(uArr|\#8657);/\$\\Uparrow \$/g; + $result =~ s/&(rArr|\#8658);/\$\\Rightarrow \$/g; + $result =~ s/&(dArr|\#8659);/\$\\Downarrow \$/g; + $result =~ s/&(hArr|\#8660);/\$\\Leftrightarrow \$/g; +#Mathematical Operators (extended HTML 4.01) + $result =~ s/&(forall|\#8704);/\$\\forall \$/g; + $result =~ s/&(part|\#8706);/\$\\partial \$/g; + $result =~ s/&(exist|\#8707);/\$\\exists \$/g; + $result =~ s/&(empty|\#8709);/\$\\emptyset \$/g; + $result =~ s/&(nabla|\#8711);/\$\\nabla \$/g; + $result =~ s/&(isin|\#8712);/\$\\in \$/g; + $result =~ s/&(notin|\#8713);/\$\\notin \$/g; + $result =~ s/&(ni|\#8715);/\$\\ni \$/g; + $result =~ s/&(prod|\#8719);/\$\\prod \$/g; + $result =~ s/&(sum|\#8721);/\$\\sum \$/g; + $result =~ s/&(minus|\#8722);/\$-\$/g; + $result =~ s/&(lowast|\#8727);/\$*\$/g; + $result =~ s/&(radic|\#8730);/\$\\surd \$/g; + $result =~ s/&(prop|\#8733);/\$\\propto \$/g; + $result =~ s/&(infin|\#8734);/\$\\infty \$/g; + $result =~ s/&(ang|\#8736);/\$\\angle \$/g; + $result =~ s/&(and|\#8743);/\$\\wedge \$/g; + $result =~ s/&(or|\#8744);/\$\\vee \$/g; + $result =~ s/&(cap|\#8745);/\$\\cap \$/g; + $result =~ s/&(cup|\#8746);/\$\\cup \$/g; + $result =~ s/&(int|\#8747);/\$\\int \$/g; + $result =~ s/&(sim|\#8764);/\$\\sim \$/g; + $result =~ s/&(cong|\#8773);/\$\\cong \$/g; + $result =~ s/&(asymp|\#8776);/\$\\approx \$/g; + $result =~ s/&(ne|\#8800);/\$\\not= \$/g; + $result =~ s/&(equiv|\#8801);/\$\\equiv \$/g; + $result =~ s/&(le|\#8804);/\$\\leq \$/g; + $result =~ s/&(ge|\#8805);/\$\\geq \$/g; + $result =~ s/&(sub|\#8834);/\$\\subset \$/g; + $result =~ s/&(sup|\#8835);/\$\\supset \$/g; + $result =~ s/&(nsub|\#8836);/\$\\not\\subset \$/g; + $result =~ s/&(sube|\#8838);/\$\\subseteq \$/g; + $result =~ s/&(supe|\#8839);/\$\\supseteq \$/g; + $result =~ s/&(oplus|\#8853);/\$\\oplus \$/g; + $result =~ s/&(otimes|\#8855);/\$\\otimes \$/g; + $result =~ s/&(perp|\#8869);/\$\\perp \$/g; + $result =~ s/&(sdot|\#8901);/\$\\cdot \$/g; +#Geometric Shapes (extended HTML 4.01) + $result =~ s/&(loz|\#9674);/\$\\Diamond \$/g; +#Miscellaneous Symbols (extended HTML 4.01) + $result =~ s/&(spades|\#9824);/\$\\spadesuit \$/g; + $result =~ s/&(clubs|\#9827);/\$\\clubsuit \$/g; + $result =~ s/&(hearts|\#9829);/\$\\heartsuit \$/g; + $result =~ s/&(diams|\#9830);/\$\\diamondsuit \$/g; return $result; } - sub page_format { - my ($papersize,$layout,$numberofcolumns) = @_; - my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0); - if ($papersize=~/Letter/) { - if ($layout eq 'CAPA') { - if ($numberofcolumns == 1) { - $textwidth = '18 cm'; - $textheight = '25.9 cm'; - $oddoffset = '-0.57 in'; - $evenoffset = '-0.57 in'; - } elsif ($numberofcolumns == 2) { - $textwidth = '93 mm'; - $textheight = '25.9 cm'; - $oddoffset = '-0.57 in'; - $evenoffset = '-0.57 in'; - } - } elsif ($layout eq 'CBI') { - if ($numberofcolumns eq '1') { - $textwidth = '8.8 in'; - $textheight = '6.8 in'; - $oddoffset = '-40 pt'; - $evenoffset = '-60 pt'; - } elsif ($numberofcolumns == 2) { - $textwidth = '4.2 in'; - $textheight = '6.8 in'; - $oddoffset = '-40 pt'; - $evenoffset = '-60 pt'; - } - } -# } elsif($papersize=~/Legal/) { -# } elsif($papersize=~/Ledger/) { -# } elsif($papersize=~/Executive/) { - } elsif($papersize=~/A4/) { - if ($layout eq 'CAPA') { - if ($numberofcolumns == 1) { - $textwidth = '18 cm'; - $textheight = '28 cm'; - $oddoffset = '-0.57 in'; - $evenoffset = '-0.57 in'; - } elsif ($numberofcolumns == 2) { - $textwidth = '96 mm'; - $textheight = '2 cm'; - $oddoffset = '-0.57 in'; - $evenoffset = '-0.57 in'; - } - } elsif ($layout eq 'CBI') { - if ($numberofcolumns eq '1') { - $textwidth = '8.5 in'; - $textheight = '7.7 in'; - $oddoffset = '-40 pt'; - $evenoffset = '-60 pt'; - } elsif ($numberofcolumns == 2) { - $textwidth = '3.9 in'; - $textheight = '7.7 in'; - $oddoffset = '-40 pt'; - $evenoffset = '-60 pt'; - } - } -# } elsif($papersize=~/A3/) { -# } elsif($papersize=~/A2/) { -# } elsif($papersize=~/A5/) { -# } elsif($papersize=~/A6/) { - } - return $textwidth,$textheight,$oddoffset,$evenoffset; -} - - -sub page_format_new { +sub page_format { # #Correspondence between $papersize variable and real paper format: # 0 - "Letter [8 1/2x11 in]" @@ -1127,13 +400,13 @@ sub page_format_new { if ($papersize eq '0') { if ($layout eq 'book') { if ($numberofcolumns == 1) { - $textwidth = '18 cm'; - $textheight = '25.9 cm'; + $textwidth = '7.1 in'; #'18 cm'; + $textheight = '10.2 in'; #'25.9 cm'; $oddoffset = '-0.57 in'; $evenoffset = '-0.57 in'; } elsif ($numberofcolumns == 2) { - $textwidth = '93 mm'; - $textheight = '25.9 cm'; + $textwidth = '3.66 in'; #'93 mm'; + $textheight = '10.2 in'; #'25.9 cm'; $oddoffset = '-0.57 in'; $evenoffset = '-0.57 in'; } @@ -1198,6 +471,7 @@ sub get_name { 'header'); } + sub page_format_transformation { my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; my ($textwidth,$textheight,$oddoffset,$evenoffset); @@ -1213,50 +487,19 @@ sub page_format_transformation { undef,'header'); } my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header'); - if ($layout eq 'CBI') { - $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill $courseidinfo} \\vskip 5 mm /; - } elsif ($layout eq 'CAPA') { - if ($choice ne 'All class print') { - $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/; - } else { - $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; - - } - } - return $text; -} - - -sub page_format_transformation_new { - my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; - my ($textwidth,$textheight,$oddoffset,$evenoffset); - $assignment=~s/_/ /g; - if ($numberofcolumns != 1) { - ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$layout,$numberofcolumns); - } else { - ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'}); - } - my $name = &get_name(); - if ($name =~ /^\s*$/) { - $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef, - undef,'header'); - } - my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header'); if ($layout eq 'album') { $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill $courseidinfo} \\vskip 5 mm /; } elsif ($layout eq 'book') { if ($choice ne 'All class print') { - $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/; + $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/; } else { - $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; - + $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; } } return $text; } - sub page_cleanup { my $result = shift; @@ -1297,7 +540,7 @@ sub latex_corrections { my ($number_of_columns,$result) = @_; - $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g; +# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g; $result =~ s/\$number_of_columns/$number_of_columns/g; $result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License $1/; $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g; @@ -1327,15 +570,17 @@ sub latex_corrections { } -sub output_data_new { - my ($r,$helper) = @_; +sub output_data { + my ($r,$helper,$rparmhash) = @_; + my %parmhash = %$rparmhash; + my $bodytag=&Apache::loncommon::bodytag('Preparing Printout'); $r->print(< LON-CAPA output for printing - -
+$bodytag +Please stand by while processing your print request, this may take some time ... ENDPART my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; @@ -1348,14 +593,14 @@ ENDPART } else { $laystyle='book'; } - my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns); + my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns); my $assignment = $ENV{'form.assignment'}; my $LaTeXwidth; - if ($textwidth=~/(\d+)\s*cm/) { + if ($textwidth=~/(\d+\.?\d*)\s*cm/) { $LaTeXwidth = $1*10; - } elsif ($textwidth=~/(\d+)\s*mm/) { + } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) { $LaTeXwidth = $1; - } elsif ($textwidth=~/(\d+)\s*in/) { + } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) { $LaTeXwidth = $1*25.4; } $LaTeXwidth.=' mm'; @@ -1364,10 +609,10 @@ ENDPART #-- single document - problem, page, html, xml, ... my $currentURL; if ($helper->{'VARS'}->{'construction'} ne '1') { - #prins published resource + #prints published resource $currentURL=$helper->{'VARS'}->{'postdata'}; } else { - #prins resource from the construction space + #prints resource from the construction space $currentURL=$helper->{'VARS'}->{'filename'}; $currentURL=~s/\/home\//\/~/; $currentURL=~s/public_html\///; @@ -1375,23 +620,26 @@ ENDPART $selectionmade = 1; if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { my %moreenv; - $moreenv{'form.grade_target'}='tex'; $moreenv{'request.filename'}=$currentURL; - $moreenv{'form.textwidth'}=$LaTeXwidth; + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; + my $rndseed=time; + $form{'rndseed'}=$rndseed; &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($currentURL); - &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter'); + &Apache::lonnet::delenv('form.counter'); + &Apache::lonxml::init_counter(); + my $texversion=&Apache::lonnet::ssi($currentURL,%form); + &Apache::lonnet::delenv('form.counter'); + &Apache::lonnet::delenv('request.filename'); if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { - $moreenv{'form.grade_target'}='answer'; - $moreenv{'form.print_answer'}='yes'; - &Apache::lonnet::appenv(%moreenv); - my $answer=&Apache::lonnet::ssi($currentURL); - &Apache::lonnet::delenv('form.grade_target','form.print_answer'); - my $start=index($answer,'\vskip 0 mm',0); - my $finish=rindex $answer,'\vskip 0 mm' ; - if ($start!=-1 && $finish!=-1) {$answer=substr($answer,$start,$finish-$start+12);} -# $r->print('
'.$answer.'
'); return OK; - $texversion=~s/(\\end{document})/$answer$1/; + my %form; + $form{'grade_target'}='answer'; + $form{'answer_output_mode'}='tex'; + $form{'rndseed'}=$rndseed; + my $answer=&Apache::lonnet::ssi($currentURL,%form); + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; } $result .= $texversion; if ($currentURL=~m/\.page\s*$/) { @@ -1410,9 +658,16 @@ ENDPART ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { #-- produce an output string + my %form=(); + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; my $flag_latex_header_remove = 'NO'; my $flag_page_in_sequence = 'NO'; my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; + my $prevassignment=''; + &Apache::lonnet::delenv('form.counter'); + &Apache::lonxml::init_counter(); for (my $i=0;$i<=$#master_seq;$i++) { $master_seq[$i]=~/___\d+___(.*)$/; my $urlp='/res/'.$1; @@ -1423,13 +678,11 @@ ENDPART } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') { $selectionmade = 4; } - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); + $form{'symb'}=$master_seq[$i]; + $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,('symb'=>$master_seq[$i])); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); + my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { ($texversion,my $number_of_columns_page) = &page_cleanup($texversion); if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} @@ -1441,7 +694,25 @@ ENDPART } else { $texversion =~ s/\\end{document}//; } - $result .= $texversion; + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'grade_target'}='answer'; + $form{'answer_output_mode'}='tex'; + my $answer=&Apache::lonnet::ssi($urlp,%form); + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } +# $result .= $texversion; + 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, + undef,'header'); + } + my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header'); + $prevassignment=$assignment; + $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm '; + } + $result .= $texversion; $flag_latex_header_remove = 'YES'; } &Apache::lonnet::delenv('form.counter'); @@ -1463,7 +734,11 @@ 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 + &Apache::lonnet::delenv('form.counter'); + &Apache::lonxml::init_counter(); foreach my $curresline (@master_seq) { if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) { my ($map,$id,$res_url) = split(/___/,$curresline); @@ -1475,6 +750,12 @@ ENDPART } else { $rendered =~ s/\\end{document}//; } + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'answer_output_mode'}='tex'; + my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form); + $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; + } $current_output .= $rendered; } $flag_latex_header_remove = 'YES'; @@ -1482,11 +763,11 @@ ENDPART } my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; if ($current_output=~/\\documentclass/) { - $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /; + $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /; } else { my $blanspages = ''; for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';} - $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output; + $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output; } $result .= $current_output; &Apache::lonnet::delenv('form.counter'); @@ -1502,21 +783,29 @@ ENDPART $selectionmade = 6; my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'}; @list_of_files=sort @list_of_files; - my $flag_latex_header_remove = 'NO'; + my $flag_latex_header_remove = 'NO'; + my $rndseed=time; 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 %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'rndseed'}=$rndseed; 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'); + my $texversion=&Apache::lonnet::ssi($urlp,%form); + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'grade_target'}='answer'; + $form{'answer_output_mode'}='tex'; + $form{'rndseed'}=$rndseed; + my $answer=&Apache::lonnet::ssi($urlp,%form); + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } #this chunck is responsible for printing the path to problem my $newurlp = ''; my $HowMany = length($urlp)*2; @@ -1546,21 +835,19 @@ ENDPART } $flag_latex_header_remove = 'YES'; } + if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;} $result .= '\end{document}'; } #-------------------------------------------------------- corrections for the different page formats - $result = &page_format_transformation_new($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'}); -# if ($layout eq 'CBI') { -# $laystyle = 'album'; -# } + $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 ($ENV{'form.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'}/; -# } + #changes page's parameters for the one column output + 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"; @@ -1585,32 +872,6 @@ sub handler { my $r = shift; my $helper; - # A hook for me to work without disturbing Alex. - if (!$ENV{'form.jeremy'}) { - my $result = printHelper($r); - if (!ref($result)) { - return $result; - } - $helper = $result; - - - - my $key; - foreach $key (keys %{$helper->{'VARS'}}) { - $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-
'); - } -# return OK; - - - &output_data_new($r,$helper); - - - - - - - return OK; - } # my $loaderror=&Apache::lonnet::overloaderror($r); # if ($loaderror) { return $loaderror; } # $loaderror= @@ -1618,50 +879,28 @@ sub handler { # $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); # if ($loaderror) { return $loaderror; } - $r->content_type('text/html'); - $r->send_http_header; - $r->print(&Apache::loncommon::bodytag("Printing")); - - if ($ENV{'request.course.id'}) { - my $fn=$ENV{'request.course.fn'}; - tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640); + my $result = printHelper($r); + if (!ref($result)) { + return $result; } + $helper = $result; + +# my $key; +# foreach $key (keys %{$helper->{'VARS'}}) { +# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-
'); +# } +# return OK; -#-- start form - &headerform($r); -#-- menu for output - unless ($ENV{'form.phase'}) { - &menu_for_output($r); - } -#-- additional menu for class printing - if ($ENV{'form.phase'} eq 'two') { - if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') { - &sequence_content_menu(0,$r); - } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') { - &sequence_content_menu(1,$r); - } elsif($ENV{'form.choice'} eq 'All class print') { - &additional_class_menu($r); - } elsif($ENV{'form.choice'} eq 'Subdirectory print') { - &problem_choice_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 'four') { - &output_data($r); - } - untie %hash; + my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); + + my $key; +# foreach $key (keys %parmhash) { +# $r->print(' '.$key.'->'.$parmhash{$key}.'<-
'); +# } +# return OK; + + &output_data($r,$helper,\%parmhash); return OK; - } use Apache::lonhelper; @@ -1699,17 +938,18 @@ sub printHelper { Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING}); - my $helper = Apache::lonhelper::helper->new("Printing Wizard"); + my $helper = Apache::lonhelper::helper->new("Printing Helper"); $helper->declareVar('symb'); $helper->declareVar('postdata'); $helper->declareVar('filename'); $helper->declareVar('construction'); + $helper->declareVar('assignment'); # This will persistently load in the data we want from the # very first screen. # Detect whether we're coming from construction space if ($ENV{'form.postdata'} =~ /http:\/\// ) { - $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/; + $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/; $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2"; $helper->{VARS}->{'construction'} = 1; } else { @@ -1733,7 +973,7 @@ sub printHelper { } my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu; - $helper->{VARS}->{'assignment'} = $sequenceTitle; + if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;} # Extract map @@ -1758,6 +998,8 @@ sub printHelper { $subdir = &Apache::lonnet::filelocation("", $url); } + my $userCanSeeHidden = Apache::lonnavmaps::advancedUser(); + Apache::lonhelper::registerHelperTags(); # "Delete everything after the last slash." @@ -1765,7 +1007,8 @@ sub printHelper { if (not $helper->{VARS}->{'construction'}) { $subdir='/home/httpd/html/res/'.$subdir; } - + # "Remove all duplicate slashes." + $subdir =~ s|/+|/|g; # What can be printed is a very dynamic decision based on # lots of factors. So we need to dynamically build this list. @@ -1785,7 +1028,7 @@ sub printHelper { push @{$printChoices}, ["$resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; } - $r->print($helper->{VARS}->{'postdata'}); +# $r->print($helper->{VARS}->{'postdata'}); # If we're in a sequence... if ($helper->{'VARS'}->{'construction'} ne '1') { @@ -1794,18 +1037,20 @@ sub printHelper { # Allow all resources from sequence push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; - my $isProblem = '$res->is_problem();'; + my $isProblem = '$res->is_problem()'; + $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden; my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; - my $isNotMap = '!$res->is_map();'; - my $symb = '$res->symb();'; + my $isNotMap = '!$res->is_map()'; + $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden; + my $symb = '$res->symb()'; my $helperFragment = < (mark them then click "next" button)
PAGESIZE - return $isProblem + return $isProblem; $map - return $symb + return $symb; @@ -1815,7 +1060,7 @@ sub printHelper { PAGESIZE return $isNotMap; $map - return $symb + return $symb; HELPERFRAGMENT @@ -1829,22 +1074,23 @@ HELPERFRAGMENT push @{$printChoices}, ['Problems in this course', 'all_problems', 'ALL_PROBLEMS']; push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; - my $isProblem = '$res->is_problem();'; - my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; - my $symb = '$res->symb();'; + my $isProblem = '$res->is_problem()'; + $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden; + my $isProblemOrMap = '($res->is_problem() || $res->is_map())'; + $isProblemOrMap .= ' && !$res->randomout()' if !$userCanSeeHidden; + my $symb = '$res->symb()'; &Apache::lonxml::xmlparse($r, 'helper', < (mark them then click "next" button)
- + PAGESIZE - return $isProblemOrMap - return $isProblem - return $symb + return $isProblemOrMap; + return $isProblem; + return $symb; - (do not forget to select assignment itself - make another selection below)

Select resources for the assignment
 @@ -1854,17 +1100,16 @@ HELPERFRAGMENT
How should the results be printed?
 - Print students assignments without separations (as uniform flow) - Start student assignment from new page (add pagefeed after each student) - Add one emty page after each student assignment - Add two emty page after each student assignment + Start each student\'s assignment on a new page (add a pagefeed after each assignment) + Add one empty page after each student\'s assignment + Add two empty pages after each student\'s assignment CHOOSE_STUDENTS } # FIXME: That RE should come from a library somewhere. - if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) { + if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'}) { push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; my $f = '$filename'; @@ -1897,7 +1142,8 @@ CHOOSE_FROM_SUBDIR $paramHash->{CHOICES} = $printChoices; Apache::lonhelper::choices->new(); - if ($ENV{'request.role.adv'}) { + if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or + ($helper->{VARS}->{'construction'} eq '1')) { $paramHash = Apache::lonhelper::getParamHash(); $paramHash->{MESSAGE_TEXT} = "
Next option is available only for advanced users:
"; Apache::lonhelper::message->new(); @@ -2142,7 +1388,7 @@ sub render { Left margin: -