projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for SIMPLEROUTE merge (more files)
[spider.git]
/
perl
/
DXXml.pm
diff --git
a/perl/DXXml.pm
b/perl/DXXml.pm
index 21a2c1653d97fd71bb06853cbb046b049e03b1be..1b4d2e83cf10cb27e2ee9436c08094d3e24f8e15 100644
(file)
--- a/
perl/DXXml.pm
+++ b/
perl/DXXml.pm
@@
-22,11
+22,6
@@
use DXXml::Text;
use DXXml::Cmd;
use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
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;
-
$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
$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) {
$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) {
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;
}
return;
}
@@
-258,12
+253,12
@@
sub route
}
if ($fromdxchan->call eq $via) {
}
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) {
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;
}
return;
}