--- loncom/interface/lonprintout.pm	2013/05/30 05:24:11	1.627.2.5
+++ loncom/interface/lonprintout.pm	2014/01/20 06:09:58	1.627.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.627.2.5 2013/05/30 05:24:11 raeburn Exp $
+# $Id: lonprintout.pm,v 1.627.2.9 2014/01/20 06:09:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,6 @@
 #
 package Apache::lonprintout;
 use strict;
-use POSIX;
 use Apache::Constants qw(:common :http);
 use Apache::lonxml;
 use Apache::lonnet;
@@ -47,7 +46,6 @@ use File::Basename;
 
 use HTTP::Response;
 use LONCAPA::map();
-use POSIX qw(ctime);
 use Apache::lonlocal;
 use Carp;
 use LONCAPA;
@@ -494,7 +492,7 @@ RESOURCE_SELECTOR
 #
 # @return ($open, $close) 
 #
-# @note If open/close dates are not defined they will be retunred as undef
+# @note If open/close dates are not defined they will be returned as undef
 # @note It is possible for there to be no overlap in which case -1,-1 
 #       will be returned.
 # @note The algorithm used is to take the latest open date and the earliest end date.
@@ -524,7 +522,7 @@ sub compute_open_window {
 
     # If no overlap...both are -1 as promised.
 
-    if (defined($earliest_close) && defined($latest_open)
+    if (($earliest_close ne '') && ($latest_open ne '')
 	 && ($earliest_close < $latest_open)) {
 	$latest_open  = -1;
 	$earliest_close = -1;
@@ -572,11 +570,14 @@ sub printable {
 #
 # @return (opendate, closedate)
 #
-# @note If open/close dates are not defined they will be retunred as undef
+# @note If open/close dates are not defined they will be returned as undef
 # @note It is possible for there to be no overlap in which case -1,-1 
 #       will be returned.
 # @note The algorithm used is to take the latest open date and the earliest end date.
-#
+#       For consistency with &printable() in lonnavmaps.pm determination of start
+#       date for printing checks printstartdate param first, then, if not set,
+#       opendate param, then, if not set, contentopen param.
+
 
 sub get_print_dates {
     my $res = shift;
@@ -595,7 +596,18 @@ sub get_print_dates {
 	foreach my $part (@parts) {
 	    my $partopen  = $res->parmval('printstartdate', $part);
 	    my $partclose = $res->parmval('printenddate',  $part);
-
+            if (!$partopen) {
+                $partopen = $res->parmval('opendate',$part);
+            }
+            if (!$partopen) {
+                $partopen = $res->parmval('contentopen',$part);
+            }
+            if ($partopen) {
+                push(@open_dates, $partopen);
+            }
+            if ($partclose) {
+                push(@close_dates, $partclose);
+            }
 	    push(@open_dates, $partopen);
 	    push(@close_dates, $partclose);
 	}
@@ -603,13 +615,6 @@ sub get_print_dates {
 
     ($open_date, $close_date)  = &compute_open_window(\@open_dates, \@close_dates);
 
-    if ($open_date) {
-	$open_date  = POSIX::strftime('%D', localtime($open_date));
-    }
-    if ($close_date) {
-	$close_date = POSIX::strftime('%D', localtime($close_date));
-    }
-
     return ($open_date, $close_date);
 }
 
@@ -1109,7 +1114,7 @@ sub format_page_header {
     # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
     if($format =~ /\\\\\s\\\\\s/) {
         #TODO find sensible caption for page header
-        my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+        my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
         $format =~ s/\\\\\s\\\\\s/$testPrintout/;
     }
     #
@@ -1231,6 +1236,7 @@ sub is_code_valid {
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
     my @lines = &Apache::grades::get_scantronformat_file();
     foreach my $line (@lines) {
+        next if (($line =~ /^\#/) || ($line eq ''));
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -2221,7 +2227,7 @@ sub print_page_in_course {
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                        &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -2802,7 +2808,7 @@ ENDPART
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                        &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    }
@@ -3313,7 +3319,7 @@ ENDPART
 		 $moreenv{'CODE'}=&num_to_letters($code);
 	     }
              my $actual_seq = \@master_seq;
-             if ($randomorder) {
+             if ($randomorder || $randompick) {
                  $env{'form.CODE'} = $moreenv{'CODE'};
                  $actual_seq = master_seq_to_person_seq($map, \@master_seq,
                                                         undef,
@@ -3375,7 +3381,7 @@ ENDPART
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			} else {
 			    $texversion.='\vskip 0 mm \noindent\textbf{'.
-                                         &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                                         &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			}
 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -4061,7 +4067,7 @@ sub printHelper {
 		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
 	    my $navmap = Apache::lonnavmaps::navmap->new();
 	    my $res   = $navmap->getBySymb($symb);
-	    $res_printable  = $res->resprintable() | $userCanPrint; #printability in course context
+	    $res_printable  = $res->resprintable() || $userCanPrint; #printability in course context
 	    ($res_printstartdate, $res_printenddate) = 	&get_print_dates($res);
 	    ($course_open, $course_close) = &course_print_dates($res);
 	    ($map_open, $map_close)       = &map_print_dates($res);
@@ -4141,13 +4147,13 @@ sub printHelper {
     my $start_new_option;
     if ($perm{'pav'}) {
 	$start_new_option = 
-	    "<option text='".&mt('Start new page<br />before selected').
+	    "<option text='".&mt('Start new page[_1]before selected','<br />').
 	    "' variable='FINISHPAGE' />".
-	    "<option text='".&mt('Extra space<br />before selected').
+	    "<option text='".&mt('Extra space[_1]before selected','<br />').
 	    "' variable='EXTRASPACE' type='text' />" .
 	    "<option " .
 	    "' variable='POSSIBLE_RESOURCES' type='hidden' />".
-	    "<option text='".&mt('Space units<br />check for mm').
+	    "<option text='".&mt('Space units[_1]check for mm','<br />').
 	    "' variable='EXTRASPACE_UNITS' type='checkbox' />"
 	    ;
 	    
@@ -4312,7 +4318,7 @@ my $suffixXml = <<ALL_PROBLEMS;
 ALL_PROBLEMS
          &Apache::lonxml::xmlparse($r, 'helper', 
 				   &generate_resource_chooser('ALL_PROBLEMS',
-							      'SelectProblem(s) to print',
+							      'Select Problem(s) to print',
 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
 							      'RESOURCES',
 							      'PAGESIZE',
@@ -4666,12 +4672,33 @@ CHOOSE_FROM_ANY_SEQUENCE
     # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "Select Printing Options:");
     if (!$res_printable) {
-	$paramHash = Apache::lonhelper::getParamHash();
-	$paramHash->{MESSAGE_TEXT} =
-            '<p class="LC_info">'
-           .&mt('Printing for current resource is only possible between [_1] and [_2]',
-                $res_printstartdate, $res_printenddate).'</p>';
-	Apache::lonhelper::message->new();
+        my $now = time;
+        my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
+        my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
+        my $noprintmsg;
+        if (($res_printenddate) && ($res_printenddate < $now)) {
+                $noprintmsg = &mt('Printing for current resource no longer available (ended: [_1])',
+                                  $shownprintend);
+        } else {
+            if (($res_printstartdate) && ($res_printstartdate > $now)) {
+                if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {
+                    $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',
+                                  $shownprintstart,$shownprintend);
+                } elsif (!$res_printenddate) {
+                    $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',
+                                      $shownprintstart);
+                } else {
+                    $noprintmsg = &mt('Printing for current resource is unavailable');
+                }
+            }
+        }
+
+        if ($noprintmsg) {
+            $paramHash = Apache::lonhelper::getParamHash();
+            $paramHash->{MESSAGE_TEXT} =
+                '<p class="LC_info">'.$noprintmsg.'</p>';
+            Apache::lonhelper::message->new();
+        }
     }
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash = Apache::lonhelper::getParamHash();