put in input filter for ann and output filters for ann/wwv/spots

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 7a81ac23a847ff19a2ba7835427e90a2721f0d12..86dc91998fb6408bd6f2e4e3b293019a86ef51ec 100644 (file)
--- 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;
 }