--- loncom/interface/lonprintout.pm 2002/03/20 22:14:30 1.17
+++ loncom/interface/lonprintout.pm 2002/03/21 18:46:15 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.17 2002/03/20 22:14:30 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.19 2002/03/21 18:46:15 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,8 +70,8 @@ sub menu_for_output {
Current document
(you will print what you see on the screen)
- Standard LaTeX output for the primary sequence
- All documents from the top level sequence
+ All problems from the primary sequence
+ All problems from the top level sequence
And what page format do you prefer?
CBI
@@ -118,101 +118,64 @@ ENDPART
$result .= $texversion;
} elsif ($choice eq 'Standard LaTeX output for the primary sequence') {
- my @master_seq = ();
- my $keyword = 0;
- my $output_seq = '';
- my $current_file = '/res/'.$ENV{'request.ambiguous'};
- $current_file =~ s/(\/res\/physnet\/physnet)(\/m\d+)\/(.*)/$1$2$2\.sequence/;
- while ($current_file ne '') {
- my $file=&Apache::lonnet::filelocation("",$current_file);
- my $filecontents=&Apache::lonnet::getfile($file);
- my @file_seq = &content_map($filecontents);
- if (defined @file_seq) {
-#-- adding an additional array to the master one
- if (defined @master_seq) {
- my $old_value = $#master_seq;
- my $total_value = $#master_seq + $#file_seq +2;
- for (my $j=0; $j<=$old_value-$keyword+1; $j++) {
- $master_seq[$total_value-$j] = $master_seq[$old_value-$j];
- }
- for (my $j=0; $j<=$#file_seq; $j++){
- $master_seq[$keyword+$j] = $file_seq[$j];
+#-- where is the primary sequence containing file?
+ my %moreenv;
+ my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
+ $_ = $symbolic;
+ m/([^_]+)_/;
+ my $primary_sequence = '/res/'.$1;
+#-- open and analyses the primary sequence
+ my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
+ my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
+ my @master_seq = &content_map($sequencefilecontents);
+#-- produce an output string
+ for (my $i=0;$i<=$#master_seq;$i++) {
+ $_ = $master_seq[$i];
+ m/\"(.*)\"/;
+ $_ = $1;
+ my $urlp = $1;
+ if (/\.problem/) {
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ &Apache::lonnet::appenv(%moreenv);
+ my $texversion=&Apache::lonnet::ssi($urlp);
+ &Apache::lonnet::delenv('form.grade_target');
+ $texversion =~ s!\.gif!\.eps!;
+ $result .= $texversion;
}
- @file_seq = ();
- $keyword = 0;
- } else {
- @master_seq = @file_seq;
- @file_seq = ();
- }
}
-#-- checking wether .sequence file is among the set of files
- $current_file = '';
- for (my $i=0; $i<=$#file_seq; $i++) {
- $_ = $file_seq[$i];
- if (m/(.*)\.sequence/) {
- $current_file = $_;
- $keyword = $i;
- last;
- }
- }
- }
-#-- produce an output string
- for (my $i=0;$i<=$#master_seq;$i++) {
- $_ = $master_seq[$i];
- m/\"(.*)\"/;
- if (index($1,'-tc.xml',0)==-1) {
- my $file=&Apache::lonnet::filelocation("",$1);
- my $filecontents=&Apache::lonnet::getfile($file);
- $output_seq .= $filecontents;
+#-- additional cleanup for output
+ my $first_app = index($result,'\documentclass',0);
+ $first_app = index($result,'\documentclass',$first_app+5);
+ while ($first_app != -1) {
+ my $second_app = index($result,'begin{document}',$first_app);
+ $first_app = rindex($result,'\end{document}',$first_app);
+ substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';
+ $first_app = index($result,'\documentclass',$first_app+5);
}
- }
-#-- cleanup of output string (temporary cbi-specific)
- $output_seq =~ s///g;
- $output_seq =~ s/<\/physnet>//g;
- $output_seq = ''.$output_seq.' ';
-#-- final accord
- $result = &Apache::lonxml::xmlparse('tex',$output_seq,'',%mystyle);
} elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
my @master_seq = ();
- my $keyword = 0;
- my $output_seq = '';
+ my @add_file_seq = ();
#-- 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);
-#-- temporary solution (without sequence inside sequence) - have to be generalized
-
-
-
-
-# if (defined @master_seq) {
-# my $old_value = $#master_seq;
-# my $total_value = $#master_seq + $#file_seq +2;
-# for (my $j=0; $j<=$old_value-$keyword+1; $j++) {
-# $master_seq[$total_value-$j] = $master_seq[$old_value-$j];
-# }
-# for (my $j=0; $j<=$#file_seq; $j++){
-# $master_seq[$keyword+$j] = $file_seq[$j];
-# }
-# @file_seq = ();
-# $keyword = 0;
-# } else {
- @master_seq = @file_seq;
-# @file_seq = ();
-# }
-
-#-- checking wether .sequence file is among the set of files
-# my $current_file = '';
-# for (my $i=0; $i<=$#file_seq; $i++) {
-# $_ = $file_seq[$i];
-# if (m/(.*)\.sequence/) {
-# $current_file = $_;
-# $keyword = $i;
-# last;
-# }
-# }
-
+#-- do we have any other sequence inside?
+ my $i=0;
+ while ($i<=$#file_seq) {
+ $_ = $file_seq[$i];
+ if (/\.sequence$/) {
+ $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
+ $filecontents=&Apache::lonnet::getfile($file);
+ @add_file_seq = &content_map($filecontents);
+ splice(@file_seq,$i,1,@add_file_seq);
+ @add_file_seq = ();
+ $i = -1;
+ }
+ $i++;
+ }
+ @master_seq = @file_seq;
#-- produce an output string
for (my $i=0;$i<=$#master_seq;$i++) {
$_ = $master_seq[$i];
@@ -292,6 +255,7 @@ sub content_map {
m/to=\"(\d+)\"/;
push @number_seq,$1;
$startlink = index($map_string,'from="'.$1.'"',$startlink);
+ $startlink = rindex($map_string,'