Changeset 4281

Show
Ignore:
Timestamp:
06/30/07 18:21:34 (6 years ago)
Author:
p_lindheimer
Message:

#1882: fix sort order by lastname

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.3/amp_conf/bin/retrieve_op_conf_from_mysql.pl

    r3975 r4281  
    426426sub by_lastname { 
    427427  $a_var = $a->[0]; 
    428   ($a_firstname,$a_lastname)=$a_var=~/^\s*([0-9A-Za-z_.]*)\s+([0-9A-Za-z_.]*).*$/; 
    429   ($b_firstname,$b_lastname)=$b_var=~/^\s*([0-9A-Za-z_.]*)\s+([0-9A-Za-z_.]*).*$/; 
     428  $b_var = $b->[0]; 
     429  ($a_firstname,$a_lastname)=$a_var=~/^\s*([0-9A-Za-z_\-\s.]*)\s+([^0-9][0-9A-Za-z_\-.]*).*$/; 
     430  ($b_firstname,$b_lastname)=$b_var=~/^\s*([0-9A-Za-z_\-\s.]*)\s+([^0-9][0-9A-Za-z_\-.]*).*$/; 
    430431  if (!$a_lastname) {$a_lastname=$a_var;} 
    431432  if (!$b_lastname) {$b_lastname=$b_var;} 
    432433  $sortResult=lc $a_lastname cmp lc $b_lastname; 
    433   if ($sortResult == 0)  
     434  if ($sortResult == 0) 
    434435  { $sortResult=lc $a_firstname cmp lc $b_firstname } 
    435436  return $sortResult;