X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=8bb9b956c59d306b8aab36b6cab0807bca10c5bd;hb=5e704493de7958adcef0e839c8ed6de599bc21f3;hp=baa041d42bce04d1c232d2e4edf7cfb79ec2e8d0;hpb=b9438ffaee82ae1c3e2126a547b42d976e0a16f8;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index baa041d4..8bb9b956 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -27,7 +27,7 @@ require Exporter;
              print_all_fields cltounix unpad is_callsign is_latlong
 			 is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
 			 is_prefix dd is_ipaddr $pi $d2r $r2d localdata localdata_mv
-			 diffms _diffms ahour piplist mindate adate
+			 diffms _diffms
             );
 
 
@@ -54,24 +54,6 @@ sub atime
 	return $buf;
 }
 
-# just the hour
-sub ahour
-{
-	my $t = shift;
-	my ($sec,$min,$hour,$mday,$mon,$year) = gmtime((defined $t) ? $t : time);
-	my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec;
-	return $buf;
-}
-
-sub adate
-{
-	my $t = shift;
-	my ($sec,$min,$hour,$mday,$mon,$year) = gmtime((defined $t) ? $t : time);
-	$year += 1900;
-	my $buf = sprintf "%02d%s%04d", $mday, $month[$mon], $year;
-	return $buf;
-}
-
 # get a zulu time in cluster format (2300Z)
 sub ztime
 {
@@ -211,7 +193,7 @@ sub ptimelist
 sub parray
 {
 	my $ref = shift;
-	return ref $ref ? join(',', @{$ref}) : $ref;
+	return ref $ref ? join(', ', @{$ref}) : $ref;
 }
 
 # take the arg as an array reference and print as a list of pairs
@@ -238,58 +220,13 @@ sub phash
 	my $out;
 
 	while (my ($k,$v) = each %$ref) {
-		if (ref $v eq 'ARRAY') {
-			$out = "${k}=>[" . parray($v) . "],";
-		} elsif (ref $v eq 'HASH') {
-			$out = "${k}=>{" . phash($v) . "},";
-		} else {
-			$out .= "${k}=>$v,";
-		}
+		$out .= "${k}=>$v, ";
 	}
+	chop $out;					# remove last space
 	chop $out;					# remove last comma
 	return $out;
 }
 
-sub mindate
-{
-	my $t = shift;
-	my $out;
-
-	if ($main::system-$t < 86400 ) {
-		$out = ahour($t);
-	} elsif ($main::system-$t < 365*86400) {
-		$out = adate($t);
-		chop $out for (1..4);
-		$out .= ' ' . atime($t);
-		chop $out for (1..3);
-	} else {
-		$out = atime($t);
-		$out =~ s/\@/ /;
-	}
-	return $out;
-}
-
-# like phash but prints dates and times
-sub piplist
-{
-	my $ref = shift;
-	my $out;
-
-	return $ref unless ref $ref;
-	
-	while (my ($k,$v) = each %$ref) {
-		if (ref $v eq 'HASH') {
-			$out .= piplist($v);
-		} elsif (ref $v eq 'ARRAY') {
-			$out .= join(',', map { sprintf "$_->[0]@%s", mindate($_->[1]) }  ref $v->[0] eq 'ARRAY' ? @$v : $v);
-		} else {
-			$out .= $v;
-		}
-	}
-	$out =~ s/,+$//;					# remove last comma
-	return $out;
-}
-
 sub _sort_fields
 {
 	my $ref = shift;