--- loncom/interface/lonprintout.pm 2002/07/08 17:31:36 1.37 +++ loncom/interface/lonprintout.pm 2002/08/05 19:18:43 1.47 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.37 2002/07/08 17:31:36 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.47 2002/08/05 19:18:43 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,6 +58,7 @@ sub headerform {
+$ENV{'form.postdata'}

What do you want to print? Make a choice.


ENDHEADER } @@ -70,19 +71,23 @@ sub menu_for_output { Current document (you will print what you see on the screen)
+ENDMENUOUT1 + if (not $ENV{'request.role'}=~m/^au\./) { + $r->print(< All problems from the primary sequence
The whole primary sequence (problems plus all html and xml files)
All problems from the top level sequence

-ENDMENUOUT1 - my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'}); - $subdirtoprint =~ s/\/[^\/]+$//; - if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') { - $r->print(< All problems from current subdirectory (where this particular problem is)
ENDMENUOUT2 -} - $r->print(<print(< All problems from current subdirectory (where this particular problem is)
+ENDMENUOUT4 + } + $r->print(<

And what page format do you prefer?

@@ -93,7 +98,17 @@ ENDMENUOUT2
  - Number of columns: + Number of columns:
@@ -102,7 +117,7 @@ ENDMENUOUT2 -ENDMENUOUT3 +ENDMENUOUT5 } @@ -130,14 +145,18 @@ ENDPART #-- single document - problem, page, html, xml my %moreenv; $moreenv{'form.grade_target'}='tex'; + if ($ENV{'request.role'}=~m/^au\./) {$ENV{'form.url'}=~s/http:\/\/[^\/]+//;} $moreenv{'request.filename'}=$ENV{'form.url'}; &Apache::lonnet::appenv(%moreenv); my $texversion=&Apache::lonnet::ssi($ENV{'form.url'}); &Apache::lonnet::delenv('form.grade_target'); $result .= $texversion; $result = &additional_cleanup($result); - if ($ENV{'form.url'}=~m/\.page\s*$/) {($result,$number_of_columns) = &page_cleanup($result);} - } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') { + if ($ENV{'form.url'}=~m/\.page\s*$/) { + ($result,$number_of_columns) = &page_cleanup($result); + } + } 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 $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); @@ -176,26 +195,47 @@ ENDPART } elsif ($choice eq 'Standard LaTeX output for the top level sequence') { my @master_seq = (); my @add_file_seq = (); -#-- where is the main sequence of the course? + # where is the main sequence of the course? my $main_seq = '/res/'.$ENV{'request.course.uri'}; my $file=&Apache::lonnet::filelocation("",$main_seq); my $filecontents=&Apache::lonnet::getfile($file); my @file_seq = &content_map($filecontents); -#-- do we have any other sequence inside? - my $i=0; + # do we have any other sequence inside? +# $result.=$#file_seq.' '; + my $i=1; while ($i<=$#file_seq) { - $_ = $file_seq[$i]; - if (/\.sequence$/) { +# $result.=' '.$file_seq[$i].' '; + $file_seq[$i]=~s/^"//; + $file_seq[$i]=~s/"$//; + if ($file_seq[$i]=~m/\.sequence\s*$/) { $file = &Apache::lonnet::filelocation("",$file_seq[$i]); +# $result.=' location '.$file.' '; +# $result .= 'FFFFFFFFF'.$file.' '; $filecontents=&Apache::lonnet::getfile($file); @add_file_seq = &content_map($filecontents); + +# +# for (my $iu=0;$iu<=$#add_file_seq;$iu++) { +# $result .= ' SDSD '.$add_file_seq[$iu].' FDFD '; +# } +# + + splice(@file_seq,$i,1,@add_file_seq); @add_file_seq = (); $i = -1; } $i++; + last; #do not forget to remove } @master_seq = @file_seq; + +# +# for (my $iu=0;$iu<=$#file_seq;$iu++) { +# $result .= ' SSS '.$file_seq[$iu].' FFF '; +# } +# + #-- produce an output string for (my $i=0;$i<=$#master_seq;$i++) { $_ = $master_seq[$i]; @@ -216,22 +256,30 @@ ENDPART my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'}); $subdirtoprint =~ s/\/[^\/]+$//; my @list_of_files = (); - my $localdirectory = $subdirtoprint; - $localdirectory =~ s/.*(\/res\/)/$1/; - my @content_directory = &Apache::lonnet::dirlist($localdirectory); + if ($ENV{'request.role'}=~m/^au\./) { + $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//; + } else { + $subdirtoprint =~ s/.*(\/res\/)/$1/; + } + my @content_directory = (); + if ($ENV{'request.role'}=~m/^au\./) { + @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},''); + } else { + @content_directory = &Apache::lonnet::dirlist($subdirtoprint); + } for (my $iy=0;$iy<=$#content_directory;$iy++) { my @tempo_array = split(/&/,$content_directory[$iy]); - $content_directory[$iy] = $tempo_array[0]; - if ($content_directory[$iy] =~ m/^[^\.]+\.problem$/) { - push @list_of_files,$content_directory[$iy]; + if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) { + push(@list_of_files,$tempo_array[0]); } } - $localdirectory =~ s/\/$//; + $subdirtoprint =~ s/\/$//; for (my $i=0;$i<=$#list_of_files;$i++) { - my $urlp = $localdirectory.'/'.$list_of_files[$i]; + my $urlp = $subdirtoprint.'/'.$list_of_files[$i]; my %moreenv; $moreenv{'form.grade_target'}='tex'; &Apache::lonnet::appenv(%moreenv); + if ($ENV{'request.role'}=~m/^au\./) { $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; } my $texversion=&Apache::lonnet::ssi($urlp); &Apache::lonnet::delenv('form.grade_target'); $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/; @@ -275,19 +323,21 @@ ENDPART $first_comment = index($result,'