--- loncom/interface/lonprintout.pm 2002/12/11 22:04:44 1.98 +++ loncom/interface/lonprintout.pm 2003/01/23 20:19:38 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.98 2002/12/11 22:04:44 albertel Exp $ +# $Id: lonprintout.pm,v 1.105 2003/01/23 20:19:38 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,11 +66,12 @@ sub headerform {
ENDHEADER - if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { - $r->print(<print(<Path to current document: $ENV{'form.postdata'}

ENDHEADER1 -} + } } @@ -81,9 +82,10 @@ sub menu_for_output { 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/$1//; + $subdir_to_print =~ s/\Q$1\E//; $r->print(<What do you want to print? Make a choice.
@@ -151,11 +153,14 @@ ENDMENUOUT5 sub sequence_content_menu { my ($key_to,$r) = @_; + my $primary_sequence; my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); my @sequence = split('___',$symbolic); - my $primary_sequence = '/res/'.$sequence[0]; + if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} + else {$primary_sequence = '/res/'.$sequence[0];} my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); my @master_seq_view = @master_seq; + @master_seq = @master_seq; for (my $i=0;$i<=$#master_seq_view;$i++) { $master_seq_view[$i]=~/\/([^\/]+)$/; $master_seq_view[$i]=$1; @@ -217,14 +222,13 @@ sub problem_choice_menu { my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'}); $subdirtoprint =~ s/\/[^\/]+$//; my @list_of_files = (); - if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { - $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//; - } else { - $subdirtoprint =~ s/.*(\/res\/)/$1/; - } my @content_directory = (); - if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { - @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},''); + 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 { @content_directory = &Apache::lonnet::dirlist($subdirtoprint); } @@ -269,7 +273,7 @@ sub problem_choice_menu {

ENDMENUOUT1 my $i=0; - foreach my $file (@list_of_files) { + foreach my $file (sort @list_of_files) { $r->print('
'. $file); $i++; @@ -330,7 +334,7 @@ ENDMENUOUT1 }   - +  

@@ -431,7 +435,8 @@ ENDPART 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{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./)) { + 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;} @@ -440,8 +445,11 @@ ENDPART 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); - my $LaTeXwidth; - + 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)/) { @@ -488,7 +496,7 @@ ENDPART 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]; + 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') { @@ -521,14 +529,20 @@ 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 = '/res/'.$ENV{'request.course.uri'}; + my $main_seq; + if ($ENV{'request.course.uri'}=~/\/?uploaded\//) { + $main_seq = $ENV{'request.course.uri'}; + } else { + $main_seq = '/res/'.$ENV{'request.course.uri'}; + } my @file_seq = &coming_from_hash_whole($main_seq); my $flag_latex_header_remove = 'NO'; #-- produce an output string for (my $i=0;$i<=$#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)/) { + 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; @@ -542,7 +556,8 @@ ENDPART } $result .= $texversion; $flag_latex_header_remove = 'YES'; - } + } + } } $result .= '\end{document}'; } elsif ($choice eq 'All class print') { @@ -616,8 +631,8 @@ ENDPART $moreenv{'form.grade_target'}='tex'; $moreenv{'form.textwidth'}=$LaTeXwidth; &Apache::lonnet::appenv(%moreenv); - if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { - $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; + if ($urlp =~ m|/home/([^/]+)/public_html|) { + $urlp =~ s|/home/([^/]*)/public_html|/~$1|; } my $texversion=&Apache::lonnet::ssi($urlp); &Apache::lonnet::delenv('form.grade_target','form.textwidth'); @@ -693,10 +708,11 @@ sub coming_from_hash_whole { if ($hash{'src_'.$current_resource}=~/\.sequence$/) { push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource}); } else { - $mainsequence =~ /\/res\/(.*)$/; - my $presymb = $1; + my $presymb; + if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;} + elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;} my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}}; - if ($rid=~/,/) { + if ($rid=~/,/) { my @rid = split /,/, $rid; foreach my $rid_element (@rid) { if ($rid_element =~ m/^$mapid\.(\d*)/) { @@ -705,7 +721,7 @@ sub coming_from_hash_whole { } } } else { - $rid =~ m/^$mapid\.(\d*)/; + $rid =~ m/^$mapid\.(\d*)/; $rid = $1; } $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/; @@ -1184,8 +1200,14 @@ sub character_chart { sub page_format_transformation { - my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; - my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns); + my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; + my ($textwidth,$textheight,$oddoffset,$evenoffset); + $assignment=~s/_/ /g; + if ($numberofcolumns != 1) { + ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns); + } else { + ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'}); + } my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; 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{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill $courseidinfo} \\vskip 5 mm /; @@ -1193,7 +1215,7 @@ sub page_format_transformation { 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\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}} $courseidinfo - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/; } else { - $text =~ s/\\begin{document}/\\setlength{\\textheight}{$textheight}\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\textwidth}{$textwidth}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /; + $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\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /; } } return $text; @@ -1219,9 +1241,14 @@ 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); - my $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$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}}; + } if ($name_of_sequence =~ /^\s*$/) { - $map =~ m|([^/]+)$|; + $map =~ m|([^/]+)$|; $name_of_sequence = $1; } my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};