X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=de9ea018677765c837c56cf847d9ee7917ec90d0;hb=02ab82e5a26f6055cc6379ef2ff1a16fc93be2e9;hp=d7ca5ed218e2b6e8e1671091e9c2cb043a3bf4c8;hpb=9e2fbafcfdab1ee45e581524311f1a97ac41f6ad;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index d7ca5ed2..de9ea018 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -43,18 +43,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 +66,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 +194,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;
 }
 
@@ -268,11 +271,13 @@ sub writefilestr
 	}
 
 	my $fh = new IO::File ">$fn";
-	my $dd = new Data::Dumper([ $obj ]);
-	$dd->Indent(1);
-	$dd->Terse(1);
-    $dd->Quotekeys(0);
-#	$fh->print(@_) if @_ > 0;     # any header comments, lines etc
-	$fh->print($dd->Dumpxs);
-	$fh->close;
+	if ($fh) {
+		my $dd = new Data::Dumper([ $obj ]);
+		$dd->Indent(1);
+		$dd->Terse(1);
+		$dd->Quotekeys(0);
+		#	$fh->print(@_) if @_ > 0;     # any header comments, lines etc
+		$fh->print($dd->Dumpxs);
+		$fh->close;
+	}
 }