--- loncom/interface/lonprintout.pm 2003/07/14 14:30:35 1.203
+++ loncom/interface/lonprintout.pm 2003/08/01 14:47:15 1.206
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.203 2003/07/14 14:30:35 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.206 2003/08/01 14:47:15 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -619,6 +619,7 @@ ENDPART
$currentURL=$helper->{'VARS'}->{'filename'};
$currentURL=~s/\/home\//\/~/;
$currentURL=~s/public_html\///;
+ if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
}
$selectionmade = 1;
if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
@@ -1107,9 +1108,10 @@ HELPERFRAGMENT
How should the results be printed?
- Start each student\'s assignment on a new page (add a pagefeed after each assignment)
- Add one empty page after each student\'s assignment
- Add two empty pages after each student\'s assignment
+ Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)
+ Add one empty page/column after each student\'s assignment
+ Add two empty pages/column after each student\'s assignment
+ Add three empty pages/column after each student\'s assignment
CHOOSE_STUDENTS
@@ -1130,7 +1132,7 @@ CHOOSE_FROM_SUBDIR
$xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
return $filename =~
- m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+ m/\.(problem|exam|quiz|assess|survey|form|library)$/;