--- loncom/interface/lonprintout.pm 2003/02/19 15:14:54 1.118
+++ loncom/interface/lonprintout.pm 2003/02/25 16:45:25 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.118 2003/02/19 15:14:54 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.120 2003/02/25 16:45:25 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -202,7 +202,7 @@ sub sequence_content_menu {
}
}
-DDD=$#titles_master_seq $titles_master_seq[0]
+
@@ -238,6 +238,7 @@ sub problem_choice_menu {
$subdirtoprint =~ s/\/[^\/]+$//;
my @list_of_files = ();
my @content_directory = ();
+ $r->print("Subdir: " . $subdirtoprint . "
");
if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
#localmachine CSTR space
my $user=$1;
@@ -1216,9 +1217,6 @@ sub handler {
my $r = shift;
- # not sure where the form.* was getting processed.
- Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
-
# A hook for me to work without disturbing Alex.
if ($ENV{'form.jeremy'}) {
printWizard($r);
@@ -1310,29 +1308,40 @@ sub printWizard {
my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
- my $wizard = Apache::lonwizard->new("Printing Wizard");
+ my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING});
# PRINT_TYPE: What the user wants to print (current docs,
# whole sequence, etc.
- $wizard->declareVars(['PRINT_TYPE']);
+ $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'postdata', 'url',
+ 'symb', 'RESOURCES', 'FILES']);
+
+ # Extract map
+ my $symb = $wizard->{VARS}->{'symb'};
+ my ($map, $id, $url) = split(/__/, $symb);
+
+ my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.url'});
+
+ # "Delete everything after the last slash."
+ $subdir =~ s|/[^/]+$||;
+
+ # This really ought to be in some repository in loncommon or
+ # something where it can just be grabbed.
+ my $problemFilter = sub {
+ my $name = shift;
+ return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+ };
- my $subdir = $ENV{'form.postdata'};
- $subdir =~ s|http://[^/]+||;
- $subdir =~ m/\/([^\/]+)$/;
- $subdir =~ s/\Q$1\E//;
-
- # This code also shows up above... which is prefered? Is one
- # right for this context?
- #my $subdir = &Apache::lonnet::filelocation("",$ENV{'form.url'});
- #$subdir =~ s/\/[^\/]+$//;
-
Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", [
['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT'],
- ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_FORMAT'],
- ['map_problems_pages', "All of $sequenceTitle", 'CHOOSE_FORMAT'],
+ ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_PROBLEMS'],
+ ['map_problems_pages', "Problems and pages from $sequenceTitle", 'CHOOSE_PROBLEMS_HTML'],
['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_FORMAT'],
- ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FORMAT'] ],
+ ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FROM_SUBDIR'] ],
"What do you want to print?");
-
+ Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from $sequenceTitle:", '', 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map);
+ Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from $sequenceTitle:", '', "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map);
+ Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from $subdir:", '', 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter);
+ Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "Page Format", "FORMAT", "FINAL");
+
$r->print($wizard->display());
untie %hash;
@@ -1343,5 +1352,153 @@ sub printWizard {
1;
+
+package Apache::lonprintout::page_format_state;
+
+=pod
+
+=head1 Wizard state: page_format_state
+
+See lonwizard.pm documentation for discussion of the wizard framework.
+
+Apache::lonprintout::page_format_state is a state that gives the user an opportunity to select the page layout they wish to print with: Number of columns, portrait/landscape, and paper size. If you want to change the paper size choices, change the @paperSize array contents in this package.
+
+=over 4
+
+=item * B
Layout | +Columns | +Paper type | +
+ Landscape + Portrait + |
+ + | \n"; + $result .= " |