fix prefix error

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 04dcb4b2241e4f9042e8fb5ffda691c0d0ded2c7..32b1e72ec0ec65c57ae4ba4218c3b163b394a8b1 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -9,13 +9,19 @@
 package Prefix;
 
 use IO::File;
-use Carp;
 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
@@ -134,49 +140,62 @@ sub next
 
 sub extract
 {
-       my $call = uc shift;
+       my $calls = uc shift;
        my @out;
-       my @nout;
        my $p;
        my @parts;
-       my ($sp, $i);
+       my ($call, $sp, $i);
   
-       # first check if the whole thing succeeds
-       @out = get($call);
-       return @out if @out > 0 && $out[0] eq $call;
-  
-       # 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);
+               push @out, @nout if @nout;
+               next if @nout > 0 && $nout[0] eq $call;
+         
+               # 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);
+                               push @out, @nout if @nout;
+                               next if @nout > 0 && $nout[0] eq $call;
+                       }
+               }
   
-               # 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 @wout = get(substr($sp, 0, $i));
+                       next if @wout > 0 && $wout[0] gt $sp;
+#                      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 = (
@@ -187,6 +206,7 @@ my %valid = (
                         itu => '0,ITU',
                         cq => '0,CQ',
                         utcoff => '0,UTC offset',
+                        cont => '0,Continent',
                        );
 
 no strict;
@@ -199,6 +219,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;
        }