Diff for /loncom/interface/lonnavmaps.pm between versions 1.460 and 1.461

version 1.460, 2011/05/22 14:55:30 version 1.461, 2011/05/25 09:03:07
Line 3993  Get the weight for the problem. Line 3993  Get the weight for the problem.
   
 sub printable {  sub printable {
   
     &Apache::lonnet::logthis("Printable");  
     my ($self, $part) = @_;      my ($self, $part) = @_;
   
     # Get the print open/close dates for the resource.      # Get the print open/close dates for the resource.
Line 4008  sub printable { Line 4007  sub printable {
     #  - both defined: printable if start <= now <= end      #  - both defined: printable if start <= now <= end
     #      #
     my $now  = time();      my $now  = time();
     &Apache::lonnet::logthis("now: $now, Opens at $start Closes at $end");  
   
     my $startok = 1;      my $startok = 1;
     my $endok   = 1;      my $endok   = 1;
   
     if ((defined $start) && ($start ne '')) {      if ((defined $start) && ($start ne '')) {
  &Apache::lonnet::logthis("checking start time.");  
  $startok = $start <= $now;   $startok = $start <= $now;
  if (!$startok) {  
     &Apache::lonnet::logthis("Start date is after now");  
  }  
     }      }
     if ((defined $end) && ($end != '')) {      if ((defined $end) && ($end != '')) {
  &Apache::lonnet::logthis("checkin end time");  
  $endok = $end >= $now;   $endok = $end >= $now;
  if (!$endok) {  
     &Apache::lonnet::logthis("End date is prior to now");  
  }  
     }      }
     if (!($startok && $endok)) {  
  &Apache::lonnet::logthis("Resource not printable due to open/close date");  
    }  
     return $startok && $endok;      return $startok && $endok;
 }  }
   
Line 4042  sub resprintable { Line 4029  sub resprintable {
     my @parts    = @$partsref;      my @parts    = @$partsref;
   
     if ((!defined(@parts)) || (scalar(@parts) == 0)) {      if ((!defined(@parts)) || (scalar(@parts) == 0)) {
  &Apache::lonnet::logthis("resprintable - no parts trying part 0");  
  return $self->printable(0);   return $self->printable(0);
     } else {      } else {
  &Apache::lonnet::logthis("resprintable - have " . scalar(@parts) . "  parts require all to be good");  
  foreach my $part  (@parts) {   foreach my $part  (@parts) {
     if (!$self->printable($part)) {       if (!$self->printable($part)) { 
  &Apache::lonnet::logthis("resprintable - one of the parts failed date check");  
  return 0;    return 0; 
     }      }
  }   }
  &Apache::lonnet::logthis("resprintable - All parts passed date check");  
  return 1;   return 1;
     }      }
     &Apache::lonnet::logthis("resprintable - should not have gotten here?");  
 }  }
   
 sub acc {  sub acc {

Removed from v.1.460  
changed lines
  Added in v.1.461


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>