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

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 7a81ac23..7fae6317 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -9,12 +9,14 @@
 package DXUtil;
 
 use Date::Parse;
+use IO::File;
+
 use Carp;
 
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
-			 parray parraypairs shellregex
+			 parray parraypairs shellregex readfilestr
              print_all_fields cltounix iscallsign
             );
 
@@ -167,7 +169,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 +191,41 @@ 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;
 }
+
+# read in a file into a string and return it. 
+# the filename can be split into a dir and file and the 
+# file can be in upper or lower case.
+# there can also be a suffix
+sub readfilestr
+{
+	my ($dir, $file, $suffix) = @_;
+	my $fn;
+	
+	if ($suffix) {
+		$fn = "$dir/$file.$suffix";
+		unless (-e $fn) {
+			my $f = uc $file;
+			$fn = "$dir/$file.$suffix";
+		}
+	} elsif ($file) {
+		$fn = "$dir/$file";
+		unless (-e $fn) {
+			my $f = uc $file;
+			$fn = "$dir/$file";
+		}
+	} else {
+		$fn = $dir;
+	}
+	my $fh = new IO::File $fn;
+	my $s = undef;
+	if ($fh) {
+		local $/ = undef;
+		$s = <$fh>;
+		$fh->close;
+	}
+	return $s;
+}