--- loncom/interface/lonprintout.pm 2002/07/18 17:34:29 1.39
+++ 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.39 2002/07/18 17:34:29 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.47 2002/08/05 19:18:43 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,13 +72,14 @@ sub menu_for_output {
Current document
(you will print what you see on the screen)
ENDMENUOUT1
- if (!$ENV{'request.role'}=~m/^au\./) {
+ 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
ENDMENUOUT2
+ }
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
@@ -86,7 +87,6 @@ ENDMENUOUT2
All problems from current subdirectory (where this particular problem is)
ENDMENUOUT4
}
- }
$r->print(<
And what page format do you prefer?
@@ -98,7 +98,17 @@ ENDMENUOUT4
- Number of columns:
+ Number of columns:
@@ -142,8 +152,11 @@ ENDPART
&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'});
@@ -182,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];
@@ -222,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}}/;
@@ -281,19 +323,21 @@ ENDPART
$first_comment = index($result,'