fix probelm writing to wrong type of filehandle in genstats

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 69a67b9e885668e6ec135db586d3e4085b9ec52f..be8be669c8d9e8899210163112c805551cb10d7b 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -97,7 +97,8 @@ sub init
 {
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
        $fp = DXLog::new($dirprefix, "dat", 'd');
-       $statp = DXLog::new($dirprefix, "bys", 'd');
+       $statp = DXLog::new($dirprefix, "cys", 'd');
+       system("rm -f $main::data/$dirprefix/2001/*.bys");
 }
 
 sub prefix
@@ -250,7 +251,7 @@ sub ftor
        while (@b) {
                my $aa = shift @a;
                my $bb = shift @b;
-               if (@b < (length $d) - 1) {
+               if (@b < (length $d)) {
                        $out .= '\\d';
                } elsif ($aa eq $bb) {
                        $out .= $aa;
@@ -311,9 +312,9 @@ sub dup
  
        $freq = sprintf "%.1f", $freq;       # normalise frequency
        chomp $text;
+       $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        unpad($text);
-       $text =~ s/[\\\%]\d+//g;
        $text = pack("C*", map {$_ & 127} unpack("C*", $text));
        $text =~ s/[^a-zA-Z0-9]//g;
        for (0,60,120,180,240,300) {
@@ -349,13 +350,15 @@ sub genstats($)
                                [9, Bands::get_freq('6m')],
                                [10, Bands::get_freq('4m')],
                                [11, Bands::get_freq('2m')],
-                               [12, Bands::get_freq('70cm')],
-                               [13, Bands::get_freq('13cm')],
-                               [14, Bands::get_freq('9cm')],
-                               [15, Bands::get_freq('6cm')],
-                               [16, Bands::get_freq('3cm')],
-                               [17, Bands::get_freq('12mm')],
-                               [18, Bands::get_freq('6cm')],
+                               [12, Bands::get_freq('220')],
+                               [13, Bands::get_freq('70cm')],
+                               [14, Bands::get_freq('23cm')],
+                               [15, Bands::get_freq('13cm')],
+                               [16, Bands::get_freq('9cm')],
+                               [17, Bands::get_freq('6cm')],
+                               [18, Bands::get_freq('3cm')],
+                               [19, Bands::get_freq('12mm')],
+                               [20, Bands::get_freq('6cm')],
                           );
        my %list;
        my @tot;
@@ -381,7 +384,7 @@ sub genstats($)
                for ($i = 0; $i < @freq+2; $i++) {
                        $tot[$i] ||= 0;
                }
-               $out->write(join('^', 'TOTALS', @tot) . "\n");
+               $statp->write($date, join('^', 'TOTALS', @tot));
 
                for (sort {$list{$b}->[0] <=> $list{$a}->[0]} keys %list) {
                        my $ref = $list{$_};
@@ -389,9 +392,9 @@ sub genstats($)
                        for ($i = 0; $i < @freq+2; ++$i) {
                                $ref->[$i] ||= 0;
                        }
-                       $out->write(join('^', $call, @$ref) . "\n");
+                       $statp->write($date, join('^', $call, @$ref));
                }
-               $out->close;
+               $statp->close;
        }
 }