Diff for /loncom/interface/lonparmset.pm between versions 1.247 and 1.248

version 1.247, 2005/09/02 22:14:35 version 1.248, 2005/09/02 22:35:48
Line 2189  sub listdata { Line 2189  sub listdata {
     my $pointer=0;      my $pointer=0;
     $tableopen=0;      $tableopen=0;
     my $foundkeys=0;      my $foundkeys=0;
       my %keyorder=&standardkeyorder();
     foreach my $thiskey (sort {      foreach my $thiskey (sort {
    my $return;
  if ($sortorder eq 'realmstudent') {   if ($sortorder eq 'realmstudent') {
     my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);      my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
     my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);      my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
Line 2199  sub listdata { Line 2201  sub listdata {
     if (!defined($bstudent)) {      if (!defined($bstudent)) {
  ($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);   ($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
     }      }
     ($arealm cmp $brealm) || ($astudent cmp $bstudent);      $arealm=~s/\.type//;
       my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/);
       $aparm=$keyorder{'parameter_0_'.$aparm};
       $brealm=~s/\.type//;
       my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/);
       $bparm=$keyorder{'parameter_0_'.$bparm};   
       if ($ares eq $bres) {
    if (defined($aparm) && defined($bparm)) {
       ($aparm <=> $bparm);
    } elsif (defined($aparm)) {
       -1;
    } elsif (defined($bparm)) {
       1;
    } else {
       ($arealm cmp $brealm) || ($astudent cmp $bstudent);
    }
       } else {
    ($arealm cmp $brealm) || ($astudent cmp $bstudent);
       }
  } else {   } else {
     $a cmp $b;      $a cmp $b;
  }   }

Removed from v.1.247  
changed lines
  Added in v.1.248


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>