X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXUtil.pm;h=7be97ebf17a1972afb6c0c117c11c0ac91ebdc9a;hb=19f68ea69f734f50b46fba21aab99315d5803e09;hp=ac2b63e42a282212f79a8627e04468dca957f115;hpb=88c2b296ba903fdd356e351b83fcb844e2d6eacd;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index ac2b63e4..7be97ebf 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -12,8 +12,6 @@ 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 
@@ -43,18 +41,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 +64,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";
 }
 
@@ -191,9 +192,9 @@ sub shellregex
 # start an attempt at determining whether this string might be a callsign
 sub iscallsign
 {
-	my $call = shift;
-	return 1 if $call =~ /^\w+\d+/;
-	return 1 if $call =~ /^\d+\w+/;
+	my $call = uc shift;
+	return 1 if $call =~ /^[A-Z]+\d+[A-Z]+/;
+	return 1 if $call =~ /^\d+[A-Z]\d+[A-Z]+/;
 	return undef;
 }