do a better job with 'u=' and 'o-'

[spider.git] / perl / convkeps.pl

diff --git a/perl/convkeps.pl b/perl/convkeps.pl
index 65e53f40728779ca146748c878e17b2bbe20c8fc..268a7f29f7ea58a1ce3ba326a37125e4297e9bde 100755 (executable)
--- a/perl/convkeps.pl
+++ b/perl/convkeps.pl
@@ -81,7 +81,7 @@ while (<$f>) {
        ++$line;
        chomp;
        s/^\s+//;
-    s/\s+$//;
+    s/[\s\r]+$//;
        next unless $_;
        last if m{^/EX}i;
        last if m{^-};
@@ -93,7 +93,7 @@ while (<$f>) {
                
                if (/^\w+/) {
                        s/\s/-/g;
-                       $name = $_;
+                       $name = uc $_;
                        $ref = $keps{$name} = {}; 
                        $state = 2;
                }
@@ -107,8 +107,8 @@ while (<$f>) {
                        $ref->{mm2} = genenum($mm2);
                        $ref->{bstar} = genenum($bstar);
                        $ref->{elset} = $elset - 0;
-#                      print "$id $number $epoch $decay $mm2 $bstar $elset\n"; 
-#                      print "mm2: $ref->{mm2} bstar: $ref->{bstar}\n";
+                       #print "$id $number $epoch $decay $mm2 $bstar $elset\n"; 
+                       #print "mm2: $ref->{mm2} bstar: $ref->{bstar}\n";
                        
                        $state = 3;
                } else {
@@ -152,6 +152,7 @@ close(OUT);
 sub genenum
 {
        my ($sign, $frac, $esign, $exp) = unpack "aa5aa", shift;
+       $esign = '+' if $esign eq ' ';
        my $n = $sign . "." . $frac . 'e' . $esign . $exp;
        return $n - 0;
 }