version 1.246, 2005/08/30 01:25:53
|
version 1.247, 2005/09/02 22:14:35
|
Line 2191 sub listdata {
|
Line 2191 sub listdata {
|
my $foundkeys=0; |
my $foundkeys=0; |
foreach my $thiskey (sort { |
foreach my $thiskey (sort { |
if ($sortorder eq 'realmstudent') { |
if ($sortorder eq 'realmstudent') { |
my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/); |
my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); |
my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/); |
my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); |
if (!defined($astudent) && !defined($bstudent) && |
if (!defined($astudent)) { |
!defined($arealm) && !defined($brealm)) { |
($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/); |
($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/); |
|
($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/); |
|
} |
} |
($arealm cmp $brealm) || ($astudent cmp $bstudent); |
if (!defined($bstudent)) { |
|
($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/); |
|
} |
|
($arealm cmp $brealm) || ($astudent cmp $bstudent); |
} else { |
} else { |
$a cmp $b; |
$a cmp $b; |
} |
} |
} keys %{$listdata}) { |
} keys %{$listdata}) { |
|
|
if ($$listdata{$thiskey.'.type'}) { |
if ($$listdata{$thiskey.'.type'}) { |
my $thistype=$$listdata{$thiskey.'.type'}; |
my $thistype=$$listdata{$thiskey.'.type'}; |
if ($$resourcedata{$thiskey.'.type'}) { |
if ($$resourcedata{$thiskey.'.type'}) { |