X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=17ba83dca5b7ea6711c7b87fdbd2ce6f27e197ce;hb=3e78861c5df183d45e4dc69bcde40d9672ec7e58;hp=8ea62b87fbda9e742fd0a481b925e753a9b2c65e;hpb=ca18864d1264fadfe9869b630f05c950876c2169;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 8ea62b87..17ba83dc 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -8,13 +8,20 @@
 
 package Prefix;
 
-use Carp;
+use IO::File;
 use DXVars;
 use DB_File;
 use Data::Dumper;
-use Carp;
+use DXDebug;
 
 use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($db  %prefix_loc %pre);
 
 $db = undef;					# the DB_File handle
@@ -40,7 +47,7 @@ sub load
 sub store
 {
 	my ($k, $l);
-	my $fh = new FileHandle;
+	my $fh = new IO::File;
 	my $fn = "$main::data/prefix_data.pl";
   
 	confess "Prefix system not started" if !$db;
@@ -133,49 +140,73 @@ sub next
 
 sub extract
 {
-	my $call = uc shift;
+	my $calls = uc shift;
 	my @out;
-	my @nout;
 	my $p;
 	my @parts;
-	my ($sp, $i);
-  
-	# first check if the whole thing succeeds
-	@out = get($call);
-	return @out if @out > 0 && $out[0] eq $call;
+	my ($call, $sp, $i);
   
-	# now split the call into parts if required
-	@parts = ($call =~ '/') ? split('/', $call) : ($call);
-
-	# remove any /0-9 /P /A /M /MM /AM suffixes etc
-	if (@parts > 1) {
-		$p = $parts[$#parts];
-		pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|Q\w+)$/o;
-		$p = $parts[$#parts];
-		pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|Q\w+)$/o;
+	foreach $call (split /,/, $calls) {
+		# first check if the whole thing succeeds
+		my @nout = get($call);
+		if (@nout && $nout[0] eq $call) {
+			dbg("got exact prefix: $nout[0]") if isdbg('prefix');
+			push @out, @nout;
+			next;
+		}
+
+		# now split the call into parts if required
+		@parts = ($call =~ '/') ? split('/', $call) : ($call);
+
+		# remove any /0-9 /P /A /M /MM /AM suffixes etc
+		if (@parts > 1) {
+			$p = $parts[0];
+			shift @parts if $p =~ /^(WEB|NET)$/o;
+			$p = $parts[$#parts];
+			pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/o;
+			$p = $parts[$#parts];
+			pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/o;
+	  
+			# can we resolve them by direct lookup
+			foreach $p (@parts) {
+				@nout = get($p);
+				if (@nout && $nout[0] eq $call) {
+					dbg("got exact prefix: $nout[0]") if isdbg('prefix');
+					push @out, @nout;
+					next;
+				}
+			}
+		}
   
-		# can we resolve them by direct lookup
+		# which is the shortest part (first if equal)?
+		dbg("Parts: $call = " . join('|', @parts))	if isdbg('prefix');
+		$sp = $parts[0];
 		foreach $p (@parts) {
-			@out = get($p);
-			return @out if @out > 0 && $out[0] eq $call;
+			$sp = $p if length $p < length $sp;
+		}
+		$sp =~ s/-\d+$//;     # remove any SSID
+		
+#		# now start to resolve it from the left hand end
+#		for ($i = 1; $i <= length $sp; ++$i) {
+		# now start to resolve it from the right hand end
+		for ($i = length $sp; $i >= 1; --$i) {
+			my $ssp = substr($sp, 0, $i);
+			my @wout = get($ssp);
+			if (isdbg('prefix')) {
+				my $part = $wout[0] || "*";
+				dbg("Partial prefix: $sp $ssp $part" );
+			} 
+			next if @wout > 0 && $wout[0] gt $ssp;
+#			last if @wout == 0;
+			push @out, @wout;
+			last if @wout;
 		}
 	}
-  
-	# which is the shortest part (first if equal)?
-	$sp = $parts[0];
-	foreach $p (@parts) {
-		$sp = $p if length $sp > length $p;
-	}
-	# now start to resolve it from the left hand end
-	for (@out = (), $i = 1; $i <= length $sp; ++$i) {
-		@nout = get(substr($sp, 0, $i));
-		last if @nout > 0 && $nout[0] gt $sp;
-		last if @nout == 0;
-		@out = @nout;
+	if (isdbg('prefix')) {
+		my $dd = new Data::Dumper([ \@out ], [qw(@out)]);
+		dbg($dd->Dumpxs);
 	}
-  
-	# not found
-	return (@out > 0) ? @out : ();
+	return @out;
 }
 
 my %valid = (
@@ -186,6 +217,7 @@ my %valid = (
 			 itu => '0,ITU',
 			 cq => '0,CQ',
 			 utcoff => '0,UTC offset',
+			 cont => '0,Continent',
 			);
 
 no strict;
@@ -198,6 +230,9 @@ sub AUTOLOAD
 	$name =~ s/.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+	# this clever line of code creates a subroutine which takes over from autoload
+	# from OO Perl - Conway
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
 	if (@_) {
 		$self->{$name} = shift;
 	}