New improved route finding algorithm

[spider.git] / perl / DXXml.pm

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index 21a2c1653d97fd71bb06853cbb046b049e03b1be..f05f3d1c582d0b1fd9bb56eeb80908100c3490ee 100644 (file)
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -1,7 +1,7 @@
 #
 # XML handler
 #
-# $Id$
+#
 #
 # Copyright (c) Dirk Koopman, G1TLH
 #
@@ -21,12 +21,7 @@ use DXXml::IM;
 use DXXml::Text;
 use DXXml::Cmd;
 
-use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw($xs $id $max_old_age $max_future_age $dupeage);
 $xs = undef;                                   # the XML::Simple parser instance
 $id = 0;                                               # the next ID to be used
 $max_old_age = 3600;                   # how old a sentence we will accept
@@ -225,11 +220,11 @@ sub route
        $via ||= $self->{'-via'} || $self->{to};
 
        unless ($via) {
-               dbg("XML: no route specified (" . $self->toxml . ")") if isdbg('chanerr');
+               dbg("XML: no route specified (" . dd($self) . ")") if isdbg('chanerr');
                return;
        }
        if (ref $fromdxchan && $via && $fromdxchan->call eq $via) {
-               dbg("XML: Trying to route back to source (" . $self->toxml . ")") if isdbg('chanerr');
+               dbg("XML: Trying to route back to source (" . dd($self) . ")") if isdbg('chanerr');
                return;
        }
 
@@ -243,27 +238,18 @@ sub route
                dbg("route: $via -> $dxchan->{call} using normal route" ) if isdbg('route');
        }
 
-       # try the backstop method
-       unless ($dxchan) {
-               my $rcall = RouteDB::get($via);
-               if ($rcall) {
-                       $dxchan = DXChannel::get($rcall);
-                       dbg("route: $via -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
-               }
-       }
-       
        unless ($dxchan) {
                dbg("XML: no route available to $via") if isdbg('chanerr');
                return;
        }
 
        if ($fromdxchan->call eq $via) {
-               dbg("XML: Trying to route back to source (" . $self->toxml . ")") if isdbg('chanerr');
+               dbg("XML: Trying to route back to source (" . dd($self) . ")") if isdbg('chanerr');
                return;
        }
 
        if ($dxchan == $main::me) {
-               dbg("XML: Trying to route to me (" . $self->toxml . ")") if isdbg('chanerr');
+               dbg("XML: Trying to route to me (" . dd($self) . ")") if isdbg('chanerr');
                return;
        }