move stuff around and try to get pc59 handling/generation more correct

[spider.git] / perl / Route / User.pm

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index b8d5fb3633ad3155ae0952e7ffc78f720998800b..7bf19d44a5babf7c6d10a665fc0bb4e3cb0c35f8 100644 (file)
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -14,8 +14,8 @@ use Route;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /:\s+(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /:\s+\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -23,7 +23,8 @@ use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
 %valid = (
-                 dxchan => '0,Dxchan Calls,parray',
+                 dxchan => '0,Dxchan List,parray',
+                 nodes => '0,On Node(s),parray',
 );
 
 $filterdef = $Route::filterdef;
@@ -55,7 +56,6 @@ sub new
        $self->{nodes} = [ ];
        $self->{flags} = $flags;
        $list{$call} = $self;
-       dbg("creating Route::User $self->{call}") if isdbg('routelow');
 
        return $self;
 }
@@ -110,6 +110,17 @@ sub nodes
        return @{$self->{nodes}};
 }
 
+#
+# pc59 entity encoding and decoding
+#
+sub enc_pc59
+{
+       my $self = shift;
+       my $sort = shift || 'U';
+       my $out = "$sort$self->{flags}$self->{call}";
+       return $out;
+}
+
 #
 # generic AUTOLOAD for accessors
 #