--- loncom/interface/lonprintout.pm 2002/11/18 20:30:49 1.91
+++ loncom/interface/lonprintout.pm 2003/02/07 19:47:48 1.112
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.91 2002/11/18 20:30:49 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.112 2003/02/07 19:47:48 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,11 +66,12 @@ sub headerform {
<body bgcolor="FFFFFF">
<form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
ENDHEADER
- if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {
- $r->print(<<ENDHEADER1);
+
+ if ($ENV{'form.postdata'}=~m|^/res/|) {
+ $r->print(<<ENDHEADER1);
<b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
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(<<ENDMENUOUT1);
<h1>What do you want to print? Make a choice.</h1><br />
<input type="hidden" name="phase" value="two">
@@ -107,7 +109,7 @@ ENDMENUOUT6
}
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
- if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+ if ((&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
$r->print(<<ENDMENUOUT4);
<input type="radio" name="choice" value="Subdirectory print"> Problems from current subdirectory <b>$subdir_to_print</b><br />
ENDMENUOUT4
@@ -142,6 +144,7 @@ ENDMENUOUT4
</select>
</td>
</tr>
+
</table>
</br>
<input type="submit" value="Submit your choice">
@@ -151,27 +154,41 @@ 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];
- my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
+ if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}
+ else {$primary_sequence = '/res/'.$sequence[0];}
+ my @master_seq = &coming_from_hash($primary_sequence);
+ my @titles_master_seq = ();
+ for (my $i=0;$i<=$#master_seq;$i++) {
+ my ($path,$title,$symb) = split /&&/,$master_seq[$i];
+ $master_seq[$i] = $path.'&&'.$symb;
+ push @titles_master_seq, $title;
+ }
my @master_seq_view = @master_seq;
- for (my $i=0;$i<=$#master_seq_view;$i++) {
- $master_seq_view[$i]=~/\/([^\/]+)$/;
- $master_seq_view[$i]=$1;
+ if ($ENV{'user.adv'}) {
+ for (my $i=0;$i<=$#master_seq_view;$i++) {
+ $master_seq_view[$i]=~/___\d+___(.+)$/;
+ $master_seq_view[$i]='/'.$1;
+ }
+ } else {
+ for (my $i=0;$i<=$#master_seq_view;$i++) {
+ $master_seq_view[$i]=' ';
+ }
}
$r->print(<<ENDMENUOUT1);
<input type="hidden" name="url" value="$ENV{'form.url'}">
<input type="hidden" name="choice" value="$ENV{'form.choice'}">
<input type="hidden" name="layout" value="$ENV{'form.layout'}">
<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
<h1>Mark item(s) which you want to print</h1>
<script>
function checkall() {
for (i=0; i<document.forms.printform.elements.length; i++) {
- if
- (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
+ if (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
document.forms.printform.elements[i].checked=true;
}
}
@@ -185,26 +202,30 @@ sub sequence_content_menu {
}
}
</script>
+<b>DDD=$#titles_master_seq</b> $titles_master_seq[0]<br />
<input type=button onClick="checkall()" value="Check All">
-<input type=button onClick="uncheckall()" value="Uncheck">
+<input type=button onClick="uncheckall()" value="Uncheck">
+<input type="submit" value="Submit">
<p>
ENDMENUOUT1
my $inc=0;
for (my $i=0;$i<=$#master_seq_view;$i++) {
- if ($key_to==1 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
- $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '.
- $master_seq_view[$i]);
+ if ($key_to==1 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
+ $titles_master_seq[$i].'</b> <small>'.$master_seq_view[$i].'</small>');
$inc++;
- } elsif ($key_to==0 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
- $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '.
- $master_seq_view[$i]);
+ } elsif ($key_to==0 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
+ $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
+ $titles_master_seq[$i].'</b> <small>'.$master_seq_view[$i].'</small>');
$inc++;
}
}
$r->print(<<ENDMENUOUT2);
-<br />
+<br /><br />
<input type="hidden" name="numberoffiles" value="$inc">
<input type="hidden" name="phase" value="three">
+<input type=button onClick="checkall()" value="Check All">
+<input type=button onClick="uncheckall()" value="Uncheck">
<input type="submit" value="Submit">
ENDMENUOUT2
@@ -216,16 +237,16 @@ 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);
+ #local library server res space (allows to print only from the own library server)
+ @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
}
for (my $iy=0;$iy<=$#content_directory;$iy++) {
my @tempo_array = split(/&/,$content_directory[$iy]);
@@ -264,20 +285,23 @@ sub problem_choice_menu {
}
</script>
<input type=button onClick="checkall()" value="Check All">
-<input type=button onClick="uncheckall()" value="Uncheck">
+<input type=button onClick="uncheckall()" value="Uncheck">
+<input type="submit" value="Submit">
<p>
ENDMENUOUT1
my $i=0;
- foreach my $file (@list_of_files) {
+ foreach my $file (sort @list_of_files) {
$r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
$file);
$i++;
}
$r->print(<<ENDMENUOUT2);
-<br />
+<br /><br />
<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
<input type="hidden" name="numberofproblems" value="$i">
<input type="hidden" name="phase" value="three">
+<input type=button onClick="checkall()" value="Check All">
+<input type=button onClick="uncheckall()" value="Uncheck">
<input type="submit" value="Submit">
ENDMENUOUT2
}
@@ -329,7 +353,7 @@ ENDMENUOUT1
}
</script>
<input type=button onClick="checkall()" value="Check All">
-<input type=button onClick="checksec()" value="Check Section/Group">
+<input type=button onClick="checksec()" value="Type Section/Group then click">
<input type=text size=5 name=chksec>
<input type=button onClick="uncheckall()" value="Uncheck">
<p>
@@ -430,7 +454,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;}
@@ -439,29 +464,42 @@ 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)/) {
$LaTeXwidth = $1;
}
if ($choice eq 'Standard LaTeX output for current document') {
- #-- single document - problem, page, html, xml
+ #-- single document - problem, page, html, xml, ...
$selectionmade = 1;
- my %moreenv;
- $moreenv{'form.grade_target'}='tex';
- if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
+ if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
$ENV{'form.url'}=~s/http:\/\/[^\/]+//;
- }
- $moreenv{'request.filename'}=$ENV{'form.url'};
- $moreenv{'form.textwidth'}=$LaTeXwidth;
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
- &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
- $result .= $texversion;
- if ($ENV{'form.url'}=~m/\.page\s*$/) {
+ }
+ $moreenv{'request.filename'}=$ENV{'form.url'};
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
+ my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
+ &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+ $result .= $texversion;
+ if ($ENV{'form.url'}=~m/\.page\s*$/) {
($result,$number_of_columns) = &page_cleanup($result);
+ }
+ } else {
+ $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+ if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+ $result.=$1;
+ } else {
+ $result.=$ENV{'form.url'};
+ }
+ $result.=' \end{document}'
}
} elsif ($choice eq 'Standard LaTeX output for the primary sequence' or
$choice eq 'Standard LaTeX output for whole primary sequence') {
@@ -477,7 +515,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') {
@@ -487,7 +525,7 @@ ENDPART
$moreenv{'form.grade_target'}='tex';
$moreenv{'form.textwidth'}=$LaTeXwidth;
&Apache::lonnet::appenv(%moreenv);
- &Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
+ #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
&Apache::lonnet::delenv('form.grade_target','form.textwidth');
if ($urlp =~ m/\.page/) {
@@ -510,14 +548,24 @@ 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 @file_seq = &coming_from_hash_whole($main_seq);
+ 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($main_seq);
+ for (my $i=0;$i<=$#file_seq;$i++) {
+ my ($path,$title,$symb) = split /&&/,$file_seq[$i];
+ $file_seq[$i] = $path.'&&'.$symb;
+ }
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;
@@ -531,7 +579,8 @@ ENDPART
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
- }
+ }
+ }
}
$result .= '\end{document}';
} elsif ($choice eq 'All class print') {
@@ -546,8 +595,14 @@ ENDPART
#where is the primary sequence containing current resource (the same for all students)?
my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
my @sequence = split('___',$symbolic);
- my $primary_sequence = '/res/'.$sequence[0];
- my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
+ my $primary_sequence;
+ if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}
+ else {$primary_sequence = '/res/'.$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];
+ $master_seq[$i] = $path.'&&'.$symb;
+ }
#loop over students
my $flag_latex_header_remove = 'NO';
my %moreenv;
@@ -577,7 +632,7 @@ ENDPART
}
if ($current_output=~/\\documentclass/) {
my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{$courseidinfo - $assignment}}\\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{$courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
} else {
my $blanspages = '';
for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
@@ -605,8 +660,10 @@ 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|;
+ } else {
+ $urlp =~ s|^/home/httpd/html||;
}
my $texversion=&Apache::lonnet::ssi($urlp);
&Apache::lonnet::delenv('form.grade_target','form.textwidth');
@@ -670,7 +727,7 @@ FINALEND
}
-sub coming_from_hash_whole {
+sub coming_from_hash {
my $mainsequence = shift;
my @resourcelist = ();
@@ -680,12 +737,13 @@ sub coming_from_hash_whole {
my $current_resource = $mapstart;
while ($current_resource ne $mapfinish) {
if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
- push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource});
+ push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
} else {
- $mainsequence =~ /\/res\/(.*)$/;
- my $presymb = $1;
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
+ my $presymb;
+ if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}
+ elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}
+ my $rid = $current_resource;
+ if ($rid=~/,/) {
my @rid = split /,/, $rid;
foreach my $rid_element (@rid) {
if ($rid_element =~ m/^$mapid\.(\d*)/) {
@@ -694,33 +752,24 @@ sub coming_from_hash_whole {
}
}
} else {
- $rid =~ m/^$mapid\.(\d*)/;
+ $rid =~ m/^$mapid\.(\d*)/;
$rid = $1;
}
$hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
my $symb = $presymb.'___'.$rid.'___'.$1;
- push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
+ push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
}
$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
- }
- return @resourcelist;
-}
-
-
-sub coming_from_hash {
-
- my ($mainsequence,$symb) = @_;
- my @resourcelist = ();
- my $mapid = $hash{'map_pc_'.$mainsequence};
- my $mapstart = $hash{'map_start_'.$mainsequence};
- my $mapfinish = $hash{'map_finish_'.$mainsequence};
- my ($presymb) = split(/___/,$symb);
- $presymb = $presymb.'___';
- my $current_resource = $mapstart;
- while ($current_resource ne $mapfinish) {
- if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
+ }
+ #needs if final resource in the map (type="finish") contains something
+ 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 $rid = $current_resource;
+ if ($rid=~/,/) {
my @rid = split /,/, $rid;
foreach my $rid_element (@rid) {
if ($rid_element =~ m/^$mapid\.(\d*)/) {
@@ -729,38 +778,14 @@ sub coming_from_hash {
}
}
} else {
- $rid =~ m/^$mapid\.(\d*)/;
+ $rid =~ m/^$mapid\.(\d*)/;
$rid = $1;
}
$hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
- $symb = $presymb.$rid.'___'.$1;
- push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
- } else {
- push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
+ my $symb = $presymb.'___'.$rid.'___'.$1;
+ push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
}
$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
- }
- #needs if final resource in the map (type="finish") contains something
- if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
- my @rid = split /,/, $rid;
- foreach my $rid_element (@rid) {
- if ($rid_element =~ m/^$mapid\.(\d*)/) {
- $rid = $1;
- last;
- }
- }
- } else {
- $rid =~ m/^$mapid\.(\d*)/;
- $rid = $1;
- }
- $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
- $symb = $presymb.$rid.'___'.$1;
- push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
- } else {
- push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
- }
return @resourcelist;
}
@@ -1167,19 +1192,27 @@ 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 $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 /;
- } 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\}\\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 /;
- }
+ 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 $firstname = &special_character_corrections(&Apache::lonnet::unescape($ENV{'environment.firstname'}));
+ my $lastname = &special_character_corrections(&Apache::lonnet::unescape($ENV{'environment.lastname'}));
+ my $courseidinfo = &special_character_corrections(&Apache::lonnet::unescape($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{$firstname $lastname}} \\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}/;
+ } else {
+ $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;
+ }
+ return $text;
}
@@ -1202,9 +1235,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'}}};
@@ -1217,6 +1255,15 @@ sub details_for_menu {
}
+sub special_character_corrections {
+ my $argument = shift;
+ $argument =~ s/_/ /g;
+ $argument =~ s/\^/ /g;
+ $argument =~ s/&/\\&/g;
+ return $argument;
+}
+
+
sub latex_corrections {
my ($number_of_columns,$result) = @_;
@@ -1234,7 +1281,7 @@ sub latex_corrections {
$first_comment = index($result,'<!--',$first_comment);
}
$result =~ s/^\s+$//gm; #remove empty lines
- $result =~ s/(\s)+/$1/g; #removes more than one empty space
+ $result =~ s/(\s)(\s+)/$1/g; #removes more than one empty space
$result =~ s/\\\\\s*\\vskip/\\vskip/gm;
$result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
$result =~ s/{\\par }\s*\\\\/\\\\/gm;