version 1.68, 2007/05/10 18:49:39
|
version 1.69, 2007/05/15 18:55:22
|
Line 74 sub readcalendar {
|
Line 74 sub readcalendar {
|
my $courseid=shift; |
my $courseid=shift; |
my $coursenum=$env{'course.'.$courseid.'.num'}; |
my $coursenum=$env{'course.'.$courseid.'.num'}; |
my $coursedom=$env{'course.'.$courseid.'.domain'}; |
my $coursedom=$env{'course.'.$courseid.'.domain'}; |
|
if ($coursenum eq '' || $coursedom eq '') { |
|
my %courseinfo=&Apache::lonnet::coursedescription($courseid); |
|
if ($coursenum eq '' && exists($courseinfo{'num'})) { |
|
$coursenum = $courseinfo{'num'}; |
|
} |
|
if ($coursedom eq '' && exists($courseinfo{'domain'})) { |
|
$coursedom = $courseinfo{'domain'}; |
|
} |
|
} |
|
|
my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum); |
my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum); |
my %returnhash=(); |
my %returnhash=(); |
foreach my $item (keys(%thiscal)) { |
foreach my $item (keys(%thiscal)) { |
Line 92 sub readcalendar {
|
Line 102 sub readcalendar {
|
|
|
my $resourcedata= |
my $resourcedata= |
&Apache::lonnet::get_courseresdata($coursenum,$coursedom); |
&Apache::lonnet::get_courseresdata($coursenum,$coursedom); |
|
if (ref($resourcedata) ne 'HASH') { |
|
return %returnhash; |
|
} |
foreach my $thiskey (keys(%$resourcedata)) { |
foreach my $thiskey (keys(%$resourcedata)) { |
if ($resourcedata->{$thiskey.'.type'}=~/^date/) { |
if ($resourcedata->{$thiskey.'.type'}=~/^date/) { |
my ($course,$middle,$part,$name)= |
my ($course,$middle,$part,$name)= |