--- loncom/lonnet/perl/lonnet.pm 2005/03/18 19:28:20 1.613 +++ loncom/lonnet/perl/lonnet.pm 2005/03/21 18:53:51 1.614 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.613 2005/03/18 19:28:20 albertel Exp $ +# $Id: lonnet.pm,v 1.614 2005/03/21 18:53:51 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3717,8 +3717,8 @@ sub is_locked { push @check, $file_name; my %locked = &get('file_permissions',\@check, $ENV{'user.domain'},$ENV{'user.name'}); - my ($tmp)=keys(%locked); - if ($tmp=~/^error:/) { undef(%locked); } +# my ($tmp)=keys(%locked); +# if ($tmp=~/^error:/) { undef(%locked); } if (ref($locked{$file_name}) eq 'ARRAY') { $is_locked = 'true'; @@ -3732,8 +3732,8 @@ sub is_locked { sub mark_as_readonly { my ($domain,$user,$files,$what) = @_; my %current_permissions = &dump('file_permissions',$domain,$user); - my ($tmp)=keys(%current_permissions); - if ($tmp=~/^error:/) { undef(%current_permissions); } +# my ($tmp)=keys(%current_permissions); +# if ($tmp=~/^error:/) { undef(%current_permissions); } foreach my $file (@{$files}) { push(@{$current_permissions{$file}},$what); @@ -3816,8 +3816,8 @@ sub files_not_in_path { sub get_marked_as_readonly { my ($domain,$user,$what) = @_; my %current_permissions = &dump('file_permissions',$domain,$user); - my ($tmp)=keys(%current_permissions); - if ($tmp=~/^error:/) { undef(%current_permissions); } +# my ($tmp)=keys(%current_permissions); +# if ($tmp=~/^error:/) { undef(%current_permissions); } my @readonly_files; while (my ($file_name,$value) = each(%current_permissions)) { @@ -3838,8 +3838,8 @@ sub get_marked_as_readonly { sub get_marked_as_readonly_hash { my ($domain,$user,$what) = @_; my %current_permissions = &dump('file_permissions',$domain,$user); - my ($tmp)=keys(%current_permissions); - if ($tmp=~/^error:/) { undef(%current_permissions); } +# my ($tmp)=keys(%current_permissions); +# if ($tmp=~/^error:/) { undef(%current_permissions); } my %readonly_files; while (my ($file_name,$value) = each(%current_permissions)) { @@ -3862,8 +3862,8 @@ sub unmark_as_readonly { # for portfolio submissions, $what contains $crsid and $symb my ($domain,$user,$what) = @_; my %current_permissions = &dump('file_permissions',$domain,$user); - my ($tmp)=keys(%current_permissions); - if ($tmp=~/^error:/) { undef(%current_permissions); } +# my ($tmp)=keys(%current_permissions); +# if ($tmp=~/^error:/) { undef(%current_permissions); } my @readonly_files = &get_marked_as_readonly($domain,$user,$what); foreach my $file(@readonly_files){ @@ -4702,6 +4702,19 @@ sub gettitle { return $title; } +sub get_slot { + my ($which,$cnum,$cdom)=@_; + if (!$cnum || !$cdom) { + (undef,my $courseid)=&Apache::lonxml::whichuser(); + $cdom=$ENV{'course.'.$courseid.'.domain'}; + $cnum=$ENV{'course.'.$courseid.'.num'}; + } + my %slotinfo=&get('slots',[$which],$cdom,$cnum); + &Apache::lonhomework::showhash(%slotinfo); + my ($tmp)=keys(%slotinfo); + if ($tmp=~/^error:/) { return (); } + return %{$slotinfo{$which}}; +} # ------------------------------------------------- Update symbolic store links sub symblist {