version 1.56, 2006/03/30 05:20:44
|
version 1.57, 2006/04/10 07:37:16
|
Line 254 sub make_reservation {
|
Line 254 sub make_reservation {
|
if (&network_error($value)) { |
if (&network_error($value)) { |
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
foreach my $key (keys(%consumed)) { |
foreach my $key (keys(%consumed)) { |
if ($consumed{$key}->{'name'} eq $me) { |
if ($consumed{$key}->{'name'} eq $me) { |
my $num=(split('\0',$key))[1]; |
my $num=(split('\0',$key))[1]; |
Line 284 sub make_reservation {
|
Line 284 sub make_reservation {
|
return undef; |
return undef; |
} |
} |
|
|
my %reservation=('name' => $env{'user.name'}.'@'.$env{'user.domain'}, |
my %reservation=('name' => $env{'user.name'}.':'.$env{'user.domain'}, |
'timestamp' => time, |
'timestamp' => time, |
'symb' => $symb); |
'symb' => $symb); |
|
|
Line 397 sub release_all_slot {
|
Line 397 sub release_all_slot {
|
|
|
foreach my $entry (sort { $consumed{$a}{'name'} cmp |
foreach my $entry (sort { $consumed{$a}{'name'} cmp |
$consumed{$b}{'name'} } (keys(%consumed))) { |
$consumed{$b}{'name'} } (keys(%consumed))) { |
my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
my ($uname,$udom) = split(':',$consumed{$entry}{'name'}); |
my ($result,$msg) = |
my ($result,$msg) = |
&release_reservation($slot_name,$uname,$udom, |
&release_reservation($slot_name,$uname,$udom, |
$consumed{$entry}{'symb'},$mgr); |
$consumed{$entry}{'symb'},$mgr); |
Line 465 sub release_reservation {
|
Line 465 sub release_reservation {
|
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
"^$slot_name\0"); |
"^$slot_name\0"); |
foreach my $entry (keys(%consumed)) { |
foreach my $entry (keys(%consumed)) { |
if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
&Apache::lonnet::del('slot_reservations',[$entry], |
&Apache::lonnet::del('slot_reservations',[$entry], |
$cdom,$cnum); |
$cdom,$cnum); |
} |
} |
Line 1055 sub show_table {
|
Line 1055 sub show_table {
|
$consumed{$b}{name} } |
$consumed{$b}{name} } |
(keys(%consumed))) { |
(keys(%consumed))) { |
my (undef,$id)=split("\0",$entry); |
my (undef,$id)=split("\0",$entry); |
my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
my ($uname,$udom) = split(':',$consumed{$entry}{'name'}); |
$ids.= '<nobr>'; |
$ids.= '<nobr>'; |
foreach my $item (@stu_display_order) { |
foreach my $item (@stu_display_order) { |
if ($stu_display{$item}) { |
if ($stu_display{$item}) { |
if ($item eq 'fullname') { |
if ($item eq 'fullname') { |
$ids.=$fullname->{"$uname:$udom"}.' '; |
$ids.=$fullname->{"$uname:$udom"}.' '; |
} elsif ($item eq 'username') { |
} elsif ($item eq 'username') { |
$ids.="<tt>$uname\@$udom</tt> "; |
$ids.="<tt>$uname:$udom</tt> "; |
} |
} |
} |
} |
} |
} |