#
# XML handler
#
-# $Id$
+#
#
# Copyright (c) Dirk Koopman, G1TLH
#
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
eval { require XML::Parser } unless $@;
if ($@) {
LogDbg('err', "do_xml was set to 1 and the XML routines failed to load ($@)");
- $main::do_xml = 0;
+ $main::do_xml = $xs = 0;
} else {
$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
import XML::Simple;
- $DXProt::handle_xml = 1;
$xs = new XML::Simple(ContentKey=>'content', ForceArray=>1);
}
undef $@;
}
+# is XML avaiable and active
+sub available
+{
+ return $main::do_xml && $xs;
+}
+
#
# note that this a function not a method
#
my $dxchan = shift;
my $line = shift;
- unless ($main::do_xml) {
+ unless (available()) {
dbg("xml not enabled, IGNORED") if isdbg('chanerr');
return;
}
my $via = $to;
my $dxchan;
- if (my $u = $self->{u}) {
+ if (my $u = $self->{u} && $self->{to} eq $main::mycall) {
$via ||= $u if ($dxchan = DXChannel::get($u));
}
$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;
}
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;
}