--- loncom/interface/lonprintout.pm	2011/11/07 18:24:42	1.608
+++ loncom/interface/lonprintout.pm	2011/11/29 11:57:33	1.610
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.608 2011/11/07 18:24:42 raeburn Exp $
+# $Id: lonprintout.pm,v 1.610 2011/11/29 11:57:33 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,7 +302,6 @@ CHOOSE_RESOURCES
       </resource>
     </state>
 CHOOSE_RESOURCES
-
     return $result;
 }
 #
@@ -519,6 +518,7 @@ sub master_seq_to_person_seq {
 	#  Only process resources..that are not removed by randomout...
 	#  and are selected for printint as well.
 	#
+     
 	if (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
 	    my $symb = $curres->symb();
 	    if (exists $seq_hash{$symb}) {
@@ -2052,7 +2052,7 @@ sub recently_generated {
 #    A reference to a page break hash.
 #
 #
-use Data::Dumper;
+# use Data::Dumper;
 # sub dump_helper_vars {
 #    my ($helper) = @_;
 #    my $helpervars = Dumper($helper->{'VARS'});
@@ -2229,7 +2229,7 @@ sub print_construction_sequence {
 	    }
 	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
-	       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+	       ($urlp=~/$LONCAPA::assess_page_re/)) {
 		#  Don't permanently modify %$form...
 		my %answerform = %form;
 		$answerform{'grade_target'}='answer';
@@ -2707,7 +2707,7 @@ ENDPART
                             $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
                         }
 		    } else {
-			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
+			if ($urlp=~/$LONCAPA::assess_page_re/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
 #			    $texversion =~ s/\\begin{document}//; # FIXME
 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
@@ -3297,7 +3297,7 @@ sub print_resources {
 	$current_output .= &get_extra_vspaces($helper, $curresline);
 	$i++;
 	if ( !($type eq 'problems' && 
-	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) ) {
+	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
 		next;
@@ -3522,12 +3522,7 @@ sub get_randomly_ordered_warning {
 	    my $func = 
 	        sub { return ($_[0]->is_map() && $_[0]->randomorder); };
 	    my @matches = $navmap->retrieveResources($res, $func,1,1,1);
-	    if (@matches) {
-	        $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
-	    }
-        }
-        if ($message) {
-	    return '<message type="warning">'.$message.'</message>';
+
         }
     } else {
         $message = "Retrieval of information about ordering of resources failed.";