now working to 1st order OK with two nodes.

[spider.git] / perl / DXProtout.pm

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index f08fef492bbfff7afd364cf1cf2c290593380494..68405f8f4236e4521cf6e320fe0be1bbafc285b4 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -372,7 +372,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
@@ -392,8 +392,9 @@ sub pc59
        my @out;
        my $sort = shift;
        my $hexstamp = shift || hexstamp();
+       my $node = shift;
        
-       my $node = $_[0]->call;
+       my $s = "PC59^$sort^$hexstamp^$node";
        for (@_) {
                next unless $_;
                my $ref = $_;
@@ -401,7 +402,7 @@ sub pc59
                my $here = $ref->here;
                $s .= $ref->isa('Route::Node') ? "^N$here$call" : "^U$here$call";
        }
-       push @out, "PC59^$sort^$hexstamp^$node^$s" . sprintf "^%s^", get_hops(59);
+       push @out, sprintf "$s^%s^", get_hops(59);
        return @out;
 }