X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=0942c69a0c0ed5aeeb66c33f9250744d9cb2adda;hb=500bf82033a0b678d4c1a80a9bc417ae6ea53e57;hp=018a404a6249baa43fe2987ff24520c25cf33d59;hpb=980b697bd47c8f575b1c9a7f01f9b01adc6746bd;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 018a404a..0942c69a 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -10,6 +10,7 @@ package DXUtil; use Date::Parse; use IO::File; +use File::Copy; use Data::Dumper; use strict; @@ -26,6 +27,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf parray parraypairs phex shellregex readfilestr writefilestr + filecopy print_all_fields cltounix unpad is_callsign is_latlong is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem ); @@ -163,7 +165,7 @@ sub phex sub parray { my $ref = shift; - return join(', ', @{$ref}); + return ref $ref ? join(', ', @{$ref}) : $ref; } # take the arg as an array reference and print as a list of pairs @@ -321,6 +323,11 @@ sub writefilestr } } +sub filecopy +{ + copy(@_) or return $!; +} + # remove leading and trailing spaces from an input string sub unpad { @@ -339,7 +346,8 @@ sub is_callsign # check that a PC protocol field is valid text sub is_pctext { - return $_[0] =~ /^[\x09\x20-\xFF]+$/; + return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/; + return $_[0]; } # check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)