X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=86dc91998fb6408bd6f2e4e3b293019a86ef51ec;hb=6f9f47b53d1b6c2a52722b525695fa1c03ab1ed7;hp=7a81ac23a847ff19a2ba7835427e90a2721f0d12;hpb=8aa1d223307c50d8bbaa0ed4ef915f8c7365bc6e;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 7a81ac23..86dc9199 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -167,7 +167,7 @@ sub print_all_fields
 	my @fields = $ref->fields;
 	my $field;
 
-	foreach $field (sort @fields) {
+	foreach $field (sort {$ref->field_prompt($a) cmp $ref->field_prompt($b)} @fields) {
 		if (defined $ref->{$field}) {
 			my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field});
 			push @out, $ans if ($self->priv >= $priv);
@@ -189,7 +189,7 @@ sub shellregex
 sub iscallsign
 {
 	my $call = shift;
-	return 1 if $call =~ /^\w+\s+/;
+	return 1 if $call =~ /^\w+\d+/;
 	return 1 if $call =~ /^\d+\w+/;
 	return undef;
 }