[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[foxr]

foxr		Tue Nov 29 11:57:33 2011 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  BZ 6454 - Handle random selection and random ordering for print for
            selected users. 
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.609 loncom/interface/lonprintout.pm:1.610
--- loncom/interface/lonprintout.pm:1.609	Mon Nov  7 20:05:56 2011
+++ loncom/interface/lonprintout.pm	Tue Nov 29 11:57:33 2011
@@ -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 @@
       </resource>
     </state>
 CHOOSE_RESOURCES
-
     return $result;
 }
 #
@@ -519,6 +518,7 @@
 	#  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 @@
 #    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 @@
 	    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.";