projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5e4b34
)
fix the japanese problem resolving JA callsigns
author
minima
<minima>
Thu, 4 Jul 2002 14:59:27 +0000
(14:59 +0000)
committer
minima
<minima>
Thu, 4 Jul 2002 14:59:27 +0000
(14:59 +0000)
Changes
patch
|
blob
|
history
perl/Prefix.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index 52e98d82236e6f9ce8bbab1dd799a3a1557fb16c..10203196a270a937419951f3b98431b705eef69e 100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-1,3
+1,6
@@
+04Jul02=======================================================================
+1. added another fix to Prefix.pm so that it resolves Japan callsigns again
+also you can 'set/debug prefix' to see what it is trying to do.
03Jul02=======================================================================
1. Added the DEMONSTRATE command which allows a sysop to demonstrate a
command to a user (from a request by Charlie K1XX).
03Jul02=======================================================================
1. Added the DEMONSTRATE command which allows a sysop to demonstrate a
command to a user (from a request by Charlie K1XX).
diff --git
a/perl/Prefix.pm
b/perl/Prefix.pm
index 32b1e72ec0ec65c57ae4ba4218c3b163b394a8b1..ed1bd25f43a8585ded143b070fdf674659938379 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);
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);
# now split the call into parts if required
@parts = ($call =~ '/') ? split('/', $call) : ($call);
@@
-167,8
+170,11
@@
sub extract
# can we resolve them by direct lookup
foreach $p (@parts) {
@nout = get($p);
# 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;
+ }
}
}
}
}
@@
-184,8
+190,10
@@
sub extract
# for ($i = 1; $i <= length $sp; ++$i) {
# now start to resolve it from the right hand end
for ($i = length $sp; $i >= 1; --$i) {
# 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;
+ my $ssp = substr($sp, 0, $i);
+ my @wout = get($ssp);
+ dbg("Partial prefix: $sp $ssp $wout[0]" ) if isdbg('prefix') && $wout[0];
+ next if @wout > 0 && $wout[0] gt $ssp;
# last if @wout == 0;
push @out, @wout;
last if @wout;
# last if @wout == 0;
push @out, @wout;
last if @wout;