New improved route finding algorithm

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2b308407bfe591a9fee4badf0fdc5d39db9eeb78..512c30efcc0e35609c3d931f0c20bf172af517ef 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXUtil;
@@ -15,17 +15,16 @@ use Data::Dumper;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
 use vars qw(@month %patmap @ISA @EXPORT);
 
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
-                        parray parraypairs phex shellregex readfilestr writefilestr
+                        parray parraypairs phex phash shellregex readfilestr writefilestr
                         filecopy ptimelist
              print_all_fields cltounix unpad is_callsign is_latlong
                         is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
-                        is_prefix dd dxver
+                        is_prefix dd
             );
 
 
@@ -195,7 +194,7 @@ sub parraypairs
        my $ref = shift;
        my $i;
        my $out;
-  
+
        for ($i = 0; $i < @$ref; $i += 2) {
                my $r1 = @$ref[$i];
                my $r2 = @$ref[$i+1];
@@ -206,6 +205,20 @@ sub parraypairs
        return $out;
 }
 
+# take the arg as a hash reference and print it out as such
+sub phash
+{
+       my $ref = shift;
+       my $out;
+
+       while (my ($k,$v) = each %$ref) {
+               $out .= "${k}=>$v, ";
+       }
+       chop $out;                                      # remove last space
+       chop $out;                                      # remove last comma
+       return $out;
+}
+
 sub _sort_fields
 {
        my $ref = shift;
@@ -436,20 +449,3 @@ sub deleteitem
        return $n - @$list;
 }
 
-sub dxver
-{
-       my $s = shift;
-       my ($a, $b, $c, $d) = $s =~ /(\d+)\.(\d+)\.(?:(\d+)\.(\d+))?/;
-       
-       my $v = sprintf( "%d.%03d", $a, $b) || 0;
-       my $br = sprintf( "%d.%03d", $c, $d) if defined $c;
-       $br ||= 0;
-
-       $main::build += $v;
-       $main::branch += $br;
-       return ($v, $br);
-}
-
-INIT {
-       ($VERSION, $BRANCH) = dxver(q$Revision$);
-}