--- loncom/interface/lonprintout.pm 2003/02/17 16:43:54 1.117 +++ loncom/interface/lonprintout.pm 2003/03/03 20:58:18 1.126 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.117 2003/02/17 16:43:54 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.126 2003/03/03 20:58:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -157,8 +157,7 @@ sub sequence_content_menu { my $primary_sequence; my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); my @sequence = split('___',$symbolic); - if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} - else {$primary_sequence = '/res/'.$sequence[0];} + $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++) { @@ -202,7 +201,7 @@ sub sequence_content_menu { } } -DDD=$#titles_master_seq $titles_master_seq[0]
+     @@ -238,6 +237,7 @@ sub problem_choice_menu { $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; @@ -370,6 +370,7 @@ ENDDISHEADER $sdom,$sname); my $section=&Apache::lonnet::usection ($sdom,$sname,$ENV{'request.course.id'}); + if ($section == -1) { $section = ''; } $r->print( '
'. $reply{'firstname'}.' '. @@ -549,12 +550,7 @@ ENDPART } elsif ($choice eq 'Standard LaTeX output for the top level sequence') { # where is the main sequence of the course? $selectionmade = 4; - my $main_seq; - if ($ENV{'request.course.uri'}=~/\/?uploaded\//) { - $main_seq = $ENV{'request.course.uri'}; - } else { - $main_seq = '/res/'.$ENV{'request.course.uri'}; - } + 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]; @@ -597,8 +593,8 @@ ENDPART my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); my @sequence = split('___',$symbolic); my $primary_sequence; - if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} - else {$primary_sequence = '/res/'.$sequence[0];} + + $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]; @@ -612,7 +608,7 @@ ENDPART foreach my $person (@students) { my $current_output = ''; my ($usersection,$username,$userdomain) = split /:/,$person; - my $fullname = &Apache::grades::get_fullname($username,$userdomain); + 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; @@ -637,10 +633,11 @@ ENDPART } 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 } \\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 \\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::lonnet::delenv('form.counter'); + &Apache::lonxml::init_counter(); } $result .= '\end{document}'; &Apache::lonnet::delenv('form.textwidth'); @@ -740,9 +737,7 @@ sub coming_from_hash { if ($hash{'src_'.$current_resource}=~/\.sequence$/) { push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource}); } else { - my $presymb; - if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;} - elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;} + my $presymb=&Apache::lonnet::declutter($mainsequence); my $rid = $current_resource; if ($rid=~/,/) { my @rid = split /,/, $rid; @@ -756,8 +751,8 @@ sub coming_from_hash { $rid =~ m/^$mapid\.(\d*)/; $rid = $1; } - $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/; - my $symb = $presymb.'___'.$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}}; @@ -766,9 +761,7 @@ sub coming_from_hash { if ($hash{'src_'.$current_resource}=~/\.sequence$/) { push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource}); } else { - my $presymb; - if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;} - elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;} + my $presymb=&Apache::lonnet::declutter($mainsequence); my $rid = $current_resource; if ($rid=~/,/) { my @rid = split /,/, $rid; @@ -782,8 +775,8 @@ sub coming_from_hash { $rid =~ m/^$mapid\.(\d*)/; $rid = $1; } - $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/; - my $symb = $presymb.'___'.$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}}; @@ -1112,6 +1105,16 @@ sub character_chart { } +sub get_name { + my ($uname,$udom)=@_; + if (!defined($uname)) { $uname=$ENV{'user.name'}; } + if (!defined($udom)) { $uname=$ENV{'user.domain'}; } + my $plainname=&Apache::loncommon::plainname($uname,$udom); + if ($plainname=~/^\s*$/) { $plainname=$uname; } + return &Apache::lonxml::latex_special_symbols($plainname,undef,undef, + 'header'); +} + sub page_format_transformation { my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; my ($textwidth,$textheight,$oddoffset,$evenoffset); @@ -1121,14 +1124,17 @@ sub page_format_transformation { } else { ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'}); } - my $firstname = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'environment.firstname'}),'','','header'); - my $lastname = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'environment.lastname'}),'','','header'); + 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 '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{$firstname $lastname}} \\hfill $courseidinfo} \\vskip 5 mm /; + $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{$firstname $lastname} - $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 /; @@ -1157,21 +1163,18 @@ sub details_for_menu { my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}}; my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'}); my ($map,$id,$resource)=split(/___/,$symbolic); + $map=&Apache::lonnet::clutter($map); my $name_of_sequence; - if ($map=~/^uploaded/) { - $name_of_sequence = $hash{'title_'.$hash{'ids_/'.$map}}; - } else { - $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}}; - } + $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}}; if ($name_of_sequence =~ /^\s*$/) { - $map =~ m|([^/]+)$|; - $name_of_sequence = $1; + $map =~ m|([^/]+)$|; + $name_of_sequence = $1; } - my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}}; + my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}}; if ($name_of_map =~ /^\s*$/) { - $ENV{'request.course.uri'} =~ m|([^/]+)$|; - $name_of_map = $1; - } + $ENV{'request.course.uri'} =~ m|([^/]+)$|; + $name_of_map = $1; + } return ($name_of_resourse,$name_of_sequence,$name_of_map); } @@ -1215,9 +1218,6 @@ sub handler { my $r = shift; - # not sure where the form.* was getting processed. - Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING}); - # A hook for me to work without disturbing Alex. if ($ENV{'form.jeremy'}) { printWizard($r); @@ -1309,38 +1309,177 @@ sub printWizard { my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu; - my $wizard = Apache::lonwizard->new("Printing Wizard"); + my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING}); # PRINT_TYPE: What the user wants to print (current docs, # whole sequence, etc. - $wizard->declareVars(['PRINT_TYPE']); + $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'postdata', 'url', + 'symb', 'RESOURCES', 'FILES', 'STUDENTS']); + + # Extract map + my $symb = $wizard->{VARS}->{'symb'}; + my ($map, $id, $url) = split(/__/, $symb); + + my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.url'}); + + # "Delete everything after the last slash." + $subdir =~ s|/[^/]+$||; + + # This really ought to be in some repository in loncommon or + # something where it can just be grabbed. + my $problemFilter = sub { + my $name = shift; + return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/; + }; + + # What can be printed is a very dynamic decision based on + # lots of factors. So we need to dynamically build this list. + # To prevent security leaks, states are only added to the wizard + # if they can be reached, which ensures manipulating the querystring + # won't allow anyone to reach states they shouldn't have permission + # to reach. + my $printChoices = []; + # We can always print the current screen. + push @{$printChoices}, ['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT']; + + if ($ENV{'form.postdata'}=~ /\/res\//) { + # Allow problems from sequence + push @{$printChoices}, ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_PROBLEMS']; + Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from $sequenceTitle:", 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map); + + # Allow all resources from sequence + push @{$printChoices}, ['map_problems_pages', "Problems and pages from $sequenceTitle", 'CHOOSE_PROBLEMS_HTML']; + Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from $sequenceTitle:", "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map); + } + + # If the user is priviledged, allow them to print all + # problems in the course, optionally for selected students + if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { + push @{$printChoices}, ['all_problems', 'All problems in course (may take a lot of time)', 'CHOOSE_FORMAT']; + push @{$printChoices}, ['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_STUDENTS']; + Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", 'CHOOSE_FORMAT', 'STUDENTS', 1); + } + + # FIXME: That RE should come from a library somewhere. + if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) { + push @{$printChoices}, ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FROM_SUBDIR']; + Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from $subdir:", 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter); + } + + # Despite the appearance of states before here, this is the first state. + Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", $printChoices, "What do you want to print?"); + Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "Page Format", "FORMAT"); - my $subdir = $ENV{'form.postdata'}; - $subdir =~ s|http://[^/]+||; - $subdir =~ m/\/([^\/]+)$/; - $subdir =~ s/\Q$1\E//; - - # This code also shows up above... which is prefered? Is one - # right for this context? - #my $subdir = &Apache::lonnet::filelocation("",$ENV{'form.url'}); - #$subdir =~ s/\/[^\/]+$//; - - Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", [ - ['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT'], - ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_FORMAT'], - ['map_problems_pages', "All of $sequenceTitle", 'CHOOSE_FORMAT'], - ['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_FORMAT'], - ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FORMAT'] ], - "What do you want to print?"); - $r->print($wizard->display()); untie %hash; return OK; +} + + +1; + +package Apache::lonprintout::page_format_state; + +=pod + +=head1 Wizard state: page_format_state + +See lonwizard.pm documentation for discussion of the wizard framework. +Apache::lonprintout::page_format_state is a state that gives the user an opportunity to select the page layout they wish to print with: Number of columns, portrait/landscape, and paper size. If you want to change the paper size choices, change the @paperSize array contents in this package. + +=over 4 + +=item * B(parentLonWizReference, stateName, stateTitle, varName, nextState): varName is where the print information will be stored in the format FIXME. nextState is the state that follows this one. + +=back + +=cut + +use Apache::lonwizard; + +no strict; +@ISA = ("Apache::lonwizard::state"); +use strict; + +my $maxColumns = 2; +my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]", + "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]", + "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]", + "A5 [148x210 mm]", "A6 [105x148 mm]" ); + +# Tentative format: Orientation (L = Landscape, P = portrait) | Colnum | +# Paper type + +sub new { + my $proto = shift; + my $class = ref($proto) || $proto; + my $self = bless $proto->SUPER::new(shift, shift, shift); + + $self->{VAR_NAME} = shift; + $self->{NEXT_STATE} = shift; + return $self; } +sub render { + my $self = shift; + my $wizard = $self->{WIZARD}; + my $result = ''; + my $var = $self->{VAR_NAME}; + my $curVal = $self->{WIZARD}->{VARS}->{$var}; + + my ($layout, $cols, $paper) = split(/\|/, $curVal); + + my $landscapeChecked = ($layout ne "L")? '' : 'checked '; + my $portraitChecked = $landscapeChecked ? '' : 'checked '; + + $result .= <How should the printing be formatted?

+ + + + + + + + +
LayoutColumnsPaper type
+ Landscape
+ Portrait + 		+ \n"; + $result .= "
"; + $result .= ''; + return $result; +} 1; + __END__