split DXProt into handlers and processing

[spider.git] / perl / DXProtout.pm

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index dc4257a8689c2cb6e329edfa56e878a742af700f..5962665c482b942122fe307b3a89eabf8715778d 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -25,9 +25,10 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0))
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($sentencelth);
+use vars qw($sentencelth $use_newroute);
 
 $sentencelth = 180;
+$use_newroute = 1;
  
 #
 # All the PCxx generation routines
@@ -123,7 +124,8 @@ sub pc17
 # Request init string
 sub pc18
 {
-       return "PC18^DXSpider Version: $main::version Build: $main::build NewRoute^$DXProt::myprot_version^";
+       my $nr = $use_newroute ? ' !NRt' : '';
+       return "PC18^DXSpider Version: $main::version Build: $main::build$nr^$DXProt::myprot_version^";
 }
 
 #
@@ -372,7 +374,7 @@ sub hexstamp
                        $hexlastlet = chr(ord($hexlastlet) + 1);
                } while ($hexlastlet eq '^');
        }
-       return sprintf "%c%08X", $hexlastlet, $hexlasttime;
+       return sprintf "%s%08X", $hexlastlet, $hexlasttime;
 }
 
 sub pc58