[svn:qpsmtpd] r558 - branches/0.31/lib/Qpsmtpd

Author: jpeacock
Date: Tue Nov  1 07:14:48 2005
New Revision: 558

Modified:
   branches/0.31/lib/Qpsmtpd/Address.pm
Log:
* lib/Qpsmtpd/Address.pm
    Don't overload '<=>' operator casually.  Swap host/user portion
    when comparing (makes it easy to sort by domain).

Modified: branches/0.31/lib/Qpsmtpd/Address.pm
==============================================================================
--- branches/0.31/lib/Qpsmtpd/Address.pm	(original)
+++ branches/0.31/lib/Qpsmtpd/Address.pm	Tue Nov  1 07:14:48 2005
@@ -3,8 +3,7 @@ use strict;
 
 use overload (
     '""'   => \&format,
-    'cmp'  => \&spaceship,
-    '<=>'  => \&spaceship,
+    'cmp'  => \&addr_cmp,
 );
 
 sub new {
@@ -193,7 +192,7 @@ sub host {
     return $self->{_host};
 }
 
-sub spaceship {
+sub addr_cmp {
     require UNIVERSAL;
     my ($left, $right, $swap) = @_;
     my $class = ref($left);
@@ -201,12 +200,16 @@ sub spaceship {
     unless ( UNIVERSAL::isa($right, $class) ) {
 	$right = $class->new($right);
     }
-    
+
+    #invert the address so we can sort by domain then user    
+    $left = lc($left->host.'='.$left->user);
+    $right = lc($right->host.'='.$right->user);
+
     if ( $swap ) {
 	($right, $left) = ($left, $right);
     }
 
-    return lc($left->format) cmp lc($right->format);
+    return ($left cmp $right);
 }
 	
 1;