[BACK]Return to lonnavmaps.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

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

version 1.459, 2011/05/18 11:26:44 version 1.460, 2011/05/22 14:55:30
Line 2414  sub parmval { Line 2414  sub parmval {
         }          }
     }      }
     my $result = $self->parmval_real($what, $symb, $recurse);      my $result = $self->parmval_real($what, $symb, $recurse);
     my $dumper = Data::Dumper->new([$result]);  
     $self->{PARM_CACHE}->{$hashkey} = $result;      $self->{PARM_CACHE}->{$hashkey} = $result;
     if (wantarray) {      if (wantarray) {
         return @{$result};          return @{$result};
Line 3999  sub printable { Line 3998  sub printable {
   
     # Get the print open/close dates for the resource.      # Get the print open/close dates for the resource.
   
     my $start = $self->parmval("printopendate", $part);      my $start = $self->parmval("prinstartdate", $part);
     my $end   = $self->parmval("printclosedate", $part);      my $end   = $self->parmval("printenddate", $part);
     my $dumper = Data::Dumper->new([$self, $part, $start, $end]);  
     &Apache::lonnet::logthis("Start for " . $dumper->Dump);  
   
     #  The following cases apply:      #  The following cases apply:
     #  - No dates set: Printable.      #  - No dates set: Printable.
Line 4011  sub printable { Line 4008  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 ($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 ($end  ne '') {      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 4029  sub resprintable { Line 4038  sub resprintable {
   
     # get parts...or realize there are no parts.      # get parts...or realize there are no parts.
   
     my $parts = $self->parts();      my $partsref = $self->parts();
     if ($parts == 0) {      my @parts    = @$partsref;
   
       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 {
  foreach my $part  (@$parts) {   &Apache::lonnet::logthis("resprintable - have " . scalar(@parts) . "  parts require all to be good");
     if (!$self->printable($part)) { return 0; }   foreach my $part  (@parts) {
       if (!$self->printable($part)) { 
    &Apache::lonnet::logthis("resprintable - one of the parts failed date check");
    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.459  
changed lines
  Added in v.1.460

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