X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=81bace8ca1271ebc45021e3175cb80edc940592a;hb=69c8aeb338cc485103e289fbab7ec4e7e056ed20;hp=9f63c8908234eea858730c314d99493d1d69364a;hpb=0f8cb479221e09bae8e03447c78527604cf69be4;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 9f63c890..81bace8c 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -22,97 +22,97 @@ require Exporter;
 # a full time for logging and other purposes
 sub atime
 {
-  my $t = shift;
-  my ($sec,$min,$hour,$mday,$mon,$year) = gmtime((defined $t) ? $t : time);
-  $year += 1900;
-  my $buf = sprintf "%02d%s%04d\@%02d:%02d:%02d", $mday, $month[$mon], $year, $hour, $min, $sec;
-  return $buf;
+	my $t = shift;
+	my ($sec,$min,$hour,$mday,$mon,$year) = gmtime((defined $t) ? $t : time);
+	$year += 1900;
+	my $buf = sprintf "%02d%s%04d\@%02d:%02d:%02d", $mday, $month[$mon], $year, $hour, $min, $sec;
+	return $buf;
 }
 
 # get a zulu time in cluster format (2300Z)
 sub ztime
 {
-  my $t = shift;
-  my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
-  $year += 1900;
-  my $buf = sprintf "%02d%02dZ", $hour, $min;
-  return $buf;
+	my $t = shift;
+	my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
+	$year += 1900;
+	my $buf = sprintf "%02d%02dZ", $hour, $min;
+	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);
-  $year += 1900;
-  my $buf = sprintf "%02d-%s-%04d", $mday, $month[$mon], $year;
-  return $buf;
+	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;
 }
 
 # return a cluster style date time
 sub cldatetime
 {
-  my $t = shift;
-  my $date = cldate($t);
-  my $time = ztime($t);
-  return "$date $time";
+	my $t = shift;
+	my $date = cldate($t);
+	my $time = ztime($t);
+	return "$date $time";
 }
 
 # return a unix date from a cluster date and time
 sub cltounix
 {
-  my $date = shift;
-  my $time = shift;
-  $date =~ s/^\s*(\d+)-(\w\w\w)-(19\d\d)$/$1 $2 $3/;
-  $time =~ s/^(\d\d)(\d\d)Z$/$1:$2 +0000/;
-  return str2time("$date $time");
+	my $date = shift;
+	my $time = shift;
+	$date =~ s/^\s*(\d+)-(\w\w\w)-(19\d\d)$/$1 $2 $3/;
+	$time =~ s/^(\d\d)(\d\d)Z$/$1:$2 +0000/;
+	return str2time("$date $time");
 }
 
 # turn a latitude in degrees into a string
 sub slat
 {
-  my $n = shift;
-  my ($deg, $min, $let);
-  $let = $n >= 0 ? 'N' : 'S';
-  $n = abs $n;
-  $deg = int $n;
-  $min = int ((($n - $deg) * 60) + 0.5);
-  return "$deg $min $let";
+	my $n = shift;
+	my ($deg, $min, $let);
+	$let = $n >= 0 ? 'N' : 'S';
+	$n = abs $n;
+	$deg = int $n;
+	$min = int ((($n - $deg) * 60) + 0.5);
+	return "$deg $min $let";
 }
 
 # turn a longitude in degrees into a string
 sub slong
 {
-  my $n = shift;
-  my ($deg, $min, $let);
-  $let = $n >= 0 ? 'E' : 'W';
-  $n = abs $n;
-  $deg = int $n;
-  $min = int ((($n - $deg) * 60) + 0.5);
-  return "$deg $min $let";
+	my $n = shift;
+	my ($deg, $min, $let);
+	$let = $n >= 0 ? 'E' : 'W';
+	$n = abs $n;
+	$deg = int $n;
+	$min = int ((($n - $deg) * 60) + 0.5);
+	return "$deg $min $let";
 }
 
 # turn a true into 'yes' and false into 'no'
 sub yesno
 {
-  my $n = shift;
-  return $n ? $main::yes : $main::no;
+	my $n = shift;
+	return $n ? $main::yes : $main::no;
 }
 
 # format a prompt with its current value and return it with its privilege
 sub promptf
 {
-  my ($line, $value) = @_;
-  my ($priv, $prompt, $action) = split ',', $line;
-
-  # if there is an action treat it as a subroutine and replace $value
-  if ($action) {
-    my $q = qq{\$value = $action(\$value)};
-	eval $q;
-  }
-  $prompt = sprintf "%15s: %s", $prompt, $value;
-  return ($priv, $prompt);
+	my ($line, $value) = @_;
+	my ($priv, $prompt, $action) = split ',', $line;
+
+	# if there is an action treat it as a subroutine and replace $value
+	if ($action) {
+		my $q = qq{\$value = $action(\$value)};
+		eval $q;
+	}
+	$prompt = sprintf "%15s: %s", $prompt, $value;
+	return ($priv, $prompt);
 }
 
 # take an arg as an array list and print it
@@ -125,18 +125,18 @@ sub parray
 # take the arg as an array reference and print as a list of pairs
 sub parraypairs
 {
-  my $ref = shift;
-  my $i;
-  my $out;
+	my $ref = shift;
+	my $i;
+	my $out;
   
-  for ($i = 0; $i < @$ref; $i += 2) {
-    my $r1 = @$ref[$i];
-	my $r2 = @$ref[$i+1];
-	$out .= "$r1-$r2, ";
-  }
-  chop $out;     # remove last space
-  chop $out;     # remove last comma
-  return $out;
+	for ($i = 0; $i < @$ref; $i += 2) {
+		my $r1 = @$ref[$i];
+		my $r2 = @$ref[$i+1];
+		$out .= "$r1-$r2, ";
+	}
+	chop $out;					# remove last space
+	chop $out;					# remove last comma
+	return $out;
 }
 
 # print all the fields for a record according to privilege
@@ -146,18 +146,20 @@ sub parraypairs
 #
 sub print_all_fields
 {
-  my $self = shift;    # is a dxchan
-  my $ref = shift;     # is a thingy with field_prompt and fields methods defined
-  my @out = @_;
+	my $self = shift;			# is a dxchan
+	my $ref = shift;			# is a thingy with field_prompt and fields methods defined
+	my @out = @_;
  
-  my @fields = $ref->fields;
-  my $field;
-  my @out;
-
-  foreach $field (sort @fields) {
-    my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field});
-    push @out, $ans if ($self->priv >= $priv);
-  }
-  return @out;
+	my @fields = $ref->fields;
+	my $field;
+	my @out;
+
+	foreach $field (sort @fields) {
+		if (defined $ref->{$field}) {
+			my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field});
+			push @out, $ans if ($self->priv >= $priv);
+		}
+	}
+	return @out;
 }