try ALL the parts of fr5dx/t

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 01e3079c7387c46b2aa39d010c4d6dd95fea5c12..a08f5a4498820e124ef3145743fab9ab2c560439 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -149,9 +149,12 @@ sub extract
        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;
-         
+               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);
 
@@ -167,24 +170,48 @@ sub extract
                        # 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;
+                               if (@nout && $nout[0] eq $call) {
+                                       dbg("got exact prefix: $nout[0]") if isdbg('prefix');
+                                       push @out, @nout;
+                                       next;
+                               }
                        }
                }
   
                # 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 ($i = 1; $i <= length $sp; ++$i) {
-                       my @wout = get(substr($sp, 0, $i));
-                       last if @wout > 0 && $wout[0] gt $sp;
-                       last if @wout == 0;
-                       push @out, @wout;
+               dbg("Parts: $call = " . join('|', @parts))      if isdbg('prefix');
+               
+               # try ALL the parts
+L1:            for (;@parts;) {
+                       $sp = $parts[0];
+                       foreach $p (@parts) {
+                               $sp = $p if length $p < length $sp;
+                       }
+                       @parts = grep { $_ ne $sp } @parts;     # remove it from the list
+                       $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] || "*";
+                                       $part .= '*' unless $part eq '*' || $part eq $ssp;
+                                       dbg("Partial prefix: $sp $ssp $part" );
+                               } 
+                               next if @wout > 0 && $wout[0] gt $ssp;
+                               #                       last if @wout == 0;
+                               push @out, @wout;
+                               last L1 if @wout;
+                       }
                }
        }
+       if (isdbg('prefix')) {
+               my $dd = new Data::Dumper([ \@out ], [qw(@out)]);
+               dbg($dd->Dumpxs);
+       }
        return @out;
 }