--- loncom/interface/lonprintout.pm 2011/11/07 20:05:56 1.609 +++ 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.609 2011/11/07 20:05:56 www 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 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'}); @@ -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.''; + } } else { $message = "Retrieval of information about ordering of resources failed.";