pre 1.13 release

[spider.git] / perl / DXCluster.pm

diff --git a/perl/DXCluster.pm b/perl/DXCluster.pm
index 51c63f8239ed7af492148b68cf5f67007a5254af..153c70e9c80b5309ca0d0a8ffc19f31438288e96 100644 (file)
--- a/perl/DXCluster.pm
+++ b/perl/DXCluster.pm
@@ -49,11 +49,45 @@ sub alloc
   return $self;
 }
 
+# get an entry exactly as it is
+sub get_exact
+{
+  my ($pkg, $call) = @_;
+
+  # belt and braces
+  $call = uc $call;
+  
+  # search for 'as is' only
+  return $cluster{$call}; 
+}
+
+#
 # search for a call in the cluster
+# taking into account SSIDs
+#
 sub get
 {
   my ($pkg, $call) = @_;
-  return $cluster{$call};
+
+  # belt and braces
+  $call = uc $call;
+  
+  # search for 'as is'
+  my $ref = $cluster{$call}; 
+  return $ref if $ref;
+
+  # search for the unSSIDed one
+  $call =~ s/-\d+$//o;
+  $ref = $cluster{$call};
+  return $ref if $ref;
+  
+  # search for the SSIDed one
+  my $i;
+  for ($i = 1; $i < 17; $i++) {
+         $ref = $cluster{"$call-$i"};
+         return $ref if $ref;
+  }
+  return undef;
 }
 
 # get all 
@@ -137,7 +171,7 @@ sub new
 {
   my ($pkg, $dxchan, $node, $call, $confmode, $here) = @_;
 
-  die "tried to add $call when it already exists" if DXCluster->get($call);
+  die "tried to add $call when it already exists" if DXCluster->get_exact($call);
   
   my $self = $pkg->alloc($dxchan, $call, $confmode, $here);
   $self->{mynode} = $node;
@@ -190,6 +224,8 @@ sub new
   my $self = $pkg->alloc($dxchan, $call, $confmode, $here);
   $self->{pcversion} = $pcversion;
   $self->{list} = { } ;
+  $self->{mynode} = $self;   # for sh/station
+  $self->{users} = 0;
   $nodes++;
   dbg('cluster', "allocating node $call to cluster\n");
   return $self;
@@ -231,7 +267,7 @@ sub update_users
   } else {
     $self->{users} = $count;
   }
-  $users += $self->{users};
+  $users += $self->{users} if $self->{users};
   $maxusers = $users+$nodes if $users+$nodes > $maxusers;
 }