--- loncom/interface/lonprintout.pm 2003/05/05 18:48:15 1.150
+++ loncom/interface/lonprintout.pm 2003/05/12 20:29:39 1.163
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.150 2003/05/05 18:48:15 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.163 2003/05/12 20:29:39 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1349,34 +1349,7 @@ ENDPART
$laystyle='book';
}
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns);
-
-
-
-
-# my $choice = $ENV{'form.choice'};
-# my $layout = $ENV{'form.layout'};
-# my $numberofcolumns = $ENV{'form.numberofcolumns'};
-# my $papersize = $ENV{'form.papersize'};
-# my $laystyle = 'book';
my $assignment = $ENV{'form.assignment'};
-# if ($choice eq 'Subdirectory print') {
-# 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;}
-# }
-# 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;}
-# }
-
-
-# my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
-# if ($numberofcolumns == 1) {
-# $textwidth=$ENV{'form.width'};
-# $textheight=$ENV{'form.height'};
-# }
my $LaTeXwidth;
if ($textwidth=~/(\d+)\s*cm/) {
$LaTeXwidth = $1*10;
@@ -1386,33 +1359,51 @@ ENDPART
$LaTeXwidth = $1*25.4;
}
$LaTeXwidth.=' mm';
-
-
+
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
#-- single document - problem, page, html, xml, ...
my $currentURL;
- if (defined $helper->{'VARS'}->{'url'}) {
- $currentURL=$helper->{'VARS'}->{'url'};
- } else {
+ if ($helper->{'VARS'}->{'construction'} ne '1') {
+ #prins published resource
$currentURL=$helper->{'VARS'}->{'postdata'};
+ } else {
+ #prins resource from the construction space
+ $currentURL=$helper->{'VARS'}->{'filename'};
+ $currentURL=~s/\/home\//\/~/;
+ $currentURL=~s/public_html\///;
}
$selectionmade = 1;
if ($currentURL=~/\.(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',$currentURL)) {
- $currentURL=~s/http:\/\/[^\/]+//;
- }
- $moreenv{'request.filename'}=$currentURL;
- $moreenv{'form.textwidth'}=$LaTeXwidth;
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($currentURL);
- &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
- $result .= $texversion;
- if ($currentURL=~m/\.page\s*$/) {
- ($result,$number_of_columns) = &page_cleanup($result);
- }
- } else {
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ $moreenv{'request.filename'}=$currentURL;
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
+ my $texversion=&Apache::lonnet::ssi($currentURL);
+ &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+ if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ $moreenv{'form.grade_target'}='answer';
+ &Apache::lonnet::appenv(%moreenv);
+ my $answer=&Apache::lonnet::ssi($currentURL);
+ &Apache::lonnet::delenv('form.grade_target');
+ my $start=index($answer,'
',$start);
+ if ($start!=-1 && $finish!=-1) {$answer=substr($answer,$start,$finish-$start+8);}
+ $answer=~s/<\/td>\s*/ \\\\ \\hline /g;
+ $answer=~s/]*)>/\\vskip 0 mm \\begin{tabular}{|c|}\\hline /;
+ $answer=~s/<\/table>/\\end{tabular}\\vskip 0 mm/;
+ $answer=~s/\s*//;
+ $answer=~s/<\/td>\s*<\/tr>/\\\\ \\hline /;
+ $answer=~s/([^\#]*)<\/b>/\\verb|$1|/;
+ $answer=~s/([^\#]*)<\/i>/\\textit{$1}/;
+# $r->print(''.$answer.' '); return OK;
+ $texversion=~s/(\\end{document})/$answer$1/;
+ }
+ $result .= $texversion;
+ if ($currentURL=~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;
@@ -1420,9 +1411,7 @@ ENDPART
# $result.=$ENV{'form.url'};
# }
# $result.=' \end{document}'
- }
-
-
+ }
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) {
@@ -1482,10 +1471,7 @@ ENDPART
my $fullname = &get_name($username,$userdomain);
#goes through all resources, checks if they are available for current student, and produces output
foreach my $curresline (@master_seq) {
-# my ($curres,$symb) = split /&&/, $curresline;
-# if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
-# my ($map,$id,$res_url) = split(/___/,$symb);$curresres
my ($map,$id,$res_url) = split(/___/,$curresline);
if (&Apache::lonnet::allowed('bre',$res_url)) {
my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
@@ -1517,60 +1503,56 @@ ENDPART
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= '\end{document}';
&Apache::lonnet::delenv('form.textwidth');
-# } elsif ($choice eq 'Subdirectory print') {
-# #prints selected problems from the subdirectory
-# $selectionmade = 6;
-# my @list_of_files = ();
-# for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
-# if ($ENV{'form.whattoprint'.$i}=~/^\//) {
-# push @list_of_files,$ENV{'form.whattoprint'.$i};
-# }
-# }
-# my $flag_latex_header_remove = 'NO';
-# for (my $i=0;$i<=$#list_of_files;$i++) {
-# my $urlp = $list_of_files[$i];
-# if ($urlp=~/\//) {
-# my %moreenv;
-# $moreenv{'form.grade_target'}='tex';
-# $moreenv{'form.textwidth'}=$LaTeXwidth;
-# &Apache::lonnet::appenv(%moreenv);
-# 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');
-# #this chunck is responsible for printing the path to problem
-# my $newurlp = '';
-# my $HowMany = length($urlp)*2;
-# if ($HowMany > $LaTeXwidth) {
-# my @temporrary = split '/',$urlp;
-# my $HowManyNew = 0;
-# for (my $ii=0;$ii<=$#temporrary;$ii++) {
-# if ($temporrary[$ii] ne '') {
-# $HowManyNew += length($temporrary[$ii])*2;
-# if ($HowManyNew < $LaTeXwidth ) {
-# $newurlp .= '/'.$temporrary[$ii];
-# } else {
-# $HowManyNew = 0;
-# $newurlp .= '|\vskip -1 mm \noindent \verb|';
-# $ii--;
-# }
-# }
-# }
-# }
-# $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
-# if ($flag_latex_header_remove ne 'NO') {
-# $texversion = &latex_header_footer_remove($texversion);
-# } else {
-# $texversion =~ s/\\end{document}//;
-# }
-# $result .= $texversion;
-# }
-# $flag_latex_header_remove = 'YES';
-# }
-# $result .= '\end{document}';
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {
+ #prints selected problems from the subdirectory
+ $selectionmade = 6;
+ my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
+ @list_of_files=sort @list_of_files;
+ my $flag_latex_header_remove = 'NO';
+ for (my $i=0;$i<=$#list_of_files;$i++) {
+ my $urlp = $list_of_files[$i];
+ if ($urlp=~/\//) {
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
+ 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');
+ #this chunck is responsible for printing the path to problem
+ my $newurlp = '';
+ my $HowMany = length($urlp)*2;
+ if ($HowMany > $LaTeXwidth) {
+ my @temporrary = split '/',$urlp;
+ my $HowManyNew = 0;
+ for (my $ii=0;$ii<=$#temporrary;$ii++) {
+ if ($temporrary[$ii] ne '') {
+ $HowManyNew += length($temporrary[$ii])*2;
+ if ($HowManyNew < $LaTeXwidth ) {
+ $newurlp .= '/'.$temporrary[$ii];
+ } else {
+ $HowManyNew = 0;
+ $newurlp .= '|\vskip -1 mm \noindent \verb|';
+ $ii--;
+ }
+ }
+ }
+ }
+ $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
+ if ($flag_latex_header_remove ne 'NO') {
+ $texversion = &latex_header_footer_remove($texversion);
+ } else {
+ $texversion =~ s/\\end{document}//;
+ }
+ $result .= $texversion;
+ }
+ $flag_latex_header_remove = 'YES';
+ }
+ $result .= '\end{document}';
}
#-------------------------------------------------------- corrections for the different page formats
$result = &page_format_transformation_new($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
@@ -1616,12 +1598,13 @@ sub handler {
return $result;
}
$helper = $result;
-
+
+
-# my $key;
-# foreach $key (keys %{$helper->{'VARS'}}) {
-# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.' ');
-# }
+ my $key;
+ foreach $key (keys %{$helper->{'VARS'}}) {
+ $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<- ');
+ }
# return OK;
@@ -1724,40 +1707,71 @@ sub printHelper {
my $helper = Apache::lonhelper::helper->new("Printing Wizard");
$helper->declareVar('symb');
- $helper->declareVar('postdata');
+ $helper->declareVar('postdata');
+ $helper->declareVar('filename');
+ $helper->declareVar('construction');
# This will persistently load in the data we want from the
# very first screen.
- if ($ENV{'form.postdata'}) {
- $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+ # Detect whether we're coming from construction space
+ if ($ENV{'form.postdata'} =~ /http:\/\// ) {
+ $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/;
+ $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+ $helper->{VARS}->{'construction'} = 1;
+ } else {
+ if ($ENV{'form.postdata'}) {
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+ }
+ if ($ENV{'form.symb'}) {
+ $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+ }
+ if ($ENV{'form.url'}) {
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+ }
}
+
if ($ENV{'form.symb'}) {
$helper->{VARS}->{'symb'} = $ENV{'form.symb'};
}
if ($ENV{'form.url'}) {
$helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
- }
+ }
my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
$helper->{VARS}->{'assignment'} = $sequenceTitle;
+
# Extract map
my $symb = $helper->{VARS}->{'symb'};
- my ($map, $id, $url) = split(/___/, $symb);
- $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+ my ($map, $id, $url);
+ my $subdir;
+
+ # Get the resource name from construction space
+ if ($helper->{VARS}->{'construction'}) {
+ $resourceTitle = substr($helper->{VARS}->{'filename'},
+ rindex($helper->{VARS}->{'filename'}, '/')+1);
+ $subdir = substr($helper->{VARS}->{'filename'},
+ 0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
+ } else {
+ ($map, $id, $url) = split(/___/, $symb);
+ $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
- if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
- my $url = $helper->{VARS}->{'postdata'};
- $resourceTitle = substr($url, rindex($url, '/') + 1);
+ if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
+ my $url = $helper->{VARS}->{'postdata'};
+ $resourceTitle = substr($url, rindex($url, '/') + 1);
+ }
+ $subdir = &Apache::lonnet::filelocation("", $url);
}
Apache::lonhelper::registerHelperTags();
- my $subdir = &Apache::lonnet::filelocation("", $url);
-
# "Delete everything after the last slash."
$subdir =~ s|/[^/]+$||;
+ if (not $helper->{VARS}->{'construction'}) {
+ $subdir='/home/httpd/html/res/'.$subdir;
+ }
+
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.
@@ -1772,24 +1786,27 @@ sub printHelper {
# the helper by hand.
my $printChoices = [];
my $paramHash;
- # We can always print the current screen.
- push @{$printChoices}, ["$resourceTitle (exactly what was on the screen)", 'current_document', 'PAGESIZE'];
+ if ($resourceTitle) {
+ push @{$printChoices}, ["$resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+ }
+
+ $r->print($helper->{VARS}->{'postdata'});
# If we're in a sequence...
- if ($helper->{VARS}->{'postdata'} =~ /\/res\//) {
+ if ($helper->{'VARS'}->{'construction'} ne '1') {
# Allow problems from sequence
- push @{$printChoices}, ["Problems from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
+ push @{$printChoices}, ["Problem(s) from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- push @{$printChoices}, ["Problems and pages from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+ push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
my $isProblem = '$res->is_problem();';
my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
my $isNotMap = '!$res->is_map();';
my $symb = '$res->symb();';
my $helperFragment = <
- Select problems to print:
+
+ (mark them then click "next" button)
PAGESIZE
return $isProblem
@@ -1798,8 +1815,8 @@ sub printHelper {
-
- Select resources to print:
+
+ (mark them then click "next" button)
PAGESIZE
return $isNotMap;
@@ -1815,15 +1832,15 @@ HELPERFRAGMENT
# If the user is priviledged, allow them to print all
# problems in the course, optionally for selected students
if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
- push @{$printChoices}, ['All problems in course (may take a lot of time)', 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, ['Problems in this course', 'all_problems', 'ALL_PROBLEMS'];
push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
my $isProblem = '$res->is_problem();';
my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
my $symb = '$res->symb();';
&Apache::lonxml::xmlparse($r, 'helper', <
- Select problems to print:
+
+ (mark them then click "next" button)
PAGESIZE
return $isProblemOrMap
@@ -1832,33 +1849,34 @@ HELPERFRAGMENT
-
- Select the students you wish to print the problems for:
+
+ (do not forget to select assignment itself - make another selection below)
+ Select resources for the assignment
return $isProblem
$map
return $symb
- How should the results be printed?
+ How should the results be printed?
- Print all problems with no blank space between them
- Put each student's problems on a new page (add pagefeed after each student)
- Seperate each student's problems with a full blank page
- Seperate each student's problems with two full blank pages
+ Print students assignments without separations (as uniform flow)
+ Start student assignment from new page (add pagefeed after each student)
+ Add one emty page after each student assignment
+ Add two emty page after each student assignment
CHOOSE_STUDENTS
}
# FIXME: That RE should come from a library somewhere.
- if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
- push @{$printChoices}, ["Problems from $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+ if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) {
+ push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
my $f = '$filename';
my $xmlfrag = <
- Select problems you wish to print from $subdir
+
+ (mark them then click "next" button)
PAGESIZE
return '$subdir';
@@ -1875,15 +1893,29 @@ CHOOSE_FROM_SUBDIR
}
# Generate the first state, to select which resources get printed.
- Apache::lonhelper::state->new("START", "Selecting Resources to Print");
+ Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");
$paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = "What do you want to print?";
+ $paramHash->{MESSAGE_TEXT} = "";
Apache::lonhelper::message->new();
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'PRINT_TYPE';
$helper->declareVar('PRINT_TYPE');
$paramHash->{CHOICES} = $printChoices;
Apache::lonhelper::choices->new();
+
+ if ($ENV{'request.role.adv'}) {
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{MESSAGE_TEXT} = " Next option is available only for advanced users: ";
+ Apache::lonhelper::message->new();
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'variable'} = 'ANSWER_TYPE';
+ $helper->declareVar('ANSWER_TYPE');
+ $paramHash->{CHOICES} = [
+ ['Print without answer', 'yes'],
+ ['Print with answers', 'no'] ];
+ Apache::lonhelper::choices->new();
+ }
+
Apache::lonprintout::page_format_state->new("FORMAT");
# Generate the PAGESIZE state which will offer the user the margin
@@ -1972,19 +2004,19 @@ sub render {
$result .= <How should the printing be formatted?
+What page format do you prefer?
| |