X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=0fb6b8dbb848cc3c9aaf669fb1987e780f726fac;hb=cdb2c0e3a1d778485f71d406a561b38ed5238dbc;hp=caaa38008b18928ad4435612ed84357ce67b965b;hpb=295f32fa75fefedcf1cd980c5afcc5de08417ba9;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index caaa3800..0fb6b8db 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -12,13 +12,12 @@ use Date::Parse;
 use IO::File;
 use Data::Dumper;
 
-use Carp;
-
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
 			 parray parraypairs shellregex readfilestr writefilestr
-             print_all_fields cltounix iscallsign
+             print_all_fields cltounix iscallsign unpad is_callsign
+			 is_freq is_digits
             );
 
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
@@ -43,18 +42,20 @@ sub atime
 sub ztime
 {
 	my $t = shift;
-	my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
-	$year += 1900;
-	my $buf = sprintf "%02d%02dZ", $hour, $min;
+	$t = defined $t ? $t : time;
+	my $dst = shift;
+	my ($sec,$min,$hour) = $dst ? localtime($t): gmtime($t);
+	my $buf = sprintf "%02d%02d%s", $hour, $min, ($dst) ? '' : 'Z';
 	return $buf;
-
 }
 
 # get a cluster format date (23-Jun-1998)
 sub cldate
 {
 	my $t = shift;
-	my ($sec,$min,$hour,$mday,$mon,$year) = gmtime((defined $t) ? $t : time);
+	$t = defined $t ? $t : time;
+	my $dst = shift;
+	my ($sec,$min,$hour,$mday,$mon,$year) = $dst ? localtime($t) : gmtime($t);
 	$year += 1900;
 	my $buf = sprintf "%2d-%s-%04d", $mday, $month[$mon], $year;
 	return $buf;
@@ -64,8 +65,9 @@ sub cldate
 sub cldatetime
 {
 	my $t = shift;
-	my $date = cldate($t);
-	my $time = ztime($t);
+	my $dst = shift;
+	my $date = cldate($t, $dst);
+	my $time = ztime($t, $dst);
 	return "$date $time";
 }
 
@@ -278,3 +280,42 @@ sub writefilestr
 		$fh->close;
 	}
 }
+
+# remove leading and trailing spaces from an input string
+sub unpad
+{
+	my $s = shift;
+	$s =~ s/\s+$//;
+	$s =~ s/^\s+//;
+	return $s;
+}
+
+# check that a field only has callsign characters in it
+sub is_callsign
+{
+	return $_[0] !~ /[^A-Z0-9\-]/;
+}
+
+# check that a PC protocol field is valid text
+sub is_pctext
+{
+	return $_[0] !~ /[^\x20-\xA8\xE0-\xEF]/;
+}
+
+# check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)
+sub is_pcflag
+{
+	return $_[0] !~ /^[^01\*\-]$/;
+}
+
+# check that a thing is a frequency
+sub is_freq
+{
+	return $_[0] !~ /[^\d\.]/;
+}
+
+# check that a thing is just digits
+sub is_digits
+{
+	return $_[0] !~ /[^\d]/;
+}