--- loncom/interface/lonnavmaps.pm 2011/05/18 11:26:44 1.459 +++ loncom/interface/lonnavmaps.pm 2011/05/25 09:03:07 1.461 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.459 2011/05/18 11:26:44 foxr Exp $ +# $Id: lonnavmaps.pm,v 1.461 2011/05/25 09:03:07 foxr Exp $ # # Copyright Michigan State University Board of Trustees @@ -2414,7 +2414,6 @@ sub parmval { } } my $result = $self->parmval_real($what, $symb, $recurse); - my $dumper = Data::Dumper->new([$result]); $self->{PARM_CACHE}->{$hashkey} = $result; if (wantarray) { return @{$result}; @@ -3994,15 +3993,12 @@ Get the weight for the problem. sub printable { - &Apache::lonnet::logthis("Printable"); my ($self, $part) = @_; # Get the print open/close dates for the resource. - my $start = $self->parmval("printopendate", $part); - my $end = $self->parmval("printclosedate", $part); - my $dumper = Data::Dumper->new([$self, $part, $start, $end]); - &Apache::lonnet::logthis("Start for " . $dumper->Dump); + my $start = $self->parmval("prinstartdate", $part); + my $end = $self->parmval("printenddate", $part); # The following cases apply: # - No dates set: Printable. @@ -4015,10 +4011,10 @@ sub printable { my $startok = 1; my $endok = 1; - if ($start ne '') { + if ((defined $start) && ($start ne '')) { $startok = $start <= $now; } - if ($end ne '') { + if ((defined $end) && ($end != '')) { $endok = $end >= $now; } return $startok && $endok; @@ -4029,12 +4025,16 @@ sub resprintable { # get parts...or realize there are no parts. - my $parts = $self->parts(); - if ($parts == 0) { + my $partsref = $self->parts(); + my @parts = @$partsref; + + if ((!defined(@parts)) || (scalar(@parts) == 0)) { return $self->printable(0); } else { - foreach my $part (@$parts) { - if (!$self->printable($part)) { return 0; } + foreach my $part (@parts) { + if (!$self->printable($part)) { + return 0; + } } return 1; }