stop self spotting bwlow 23cms (configurable)

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 5edb1994a3ac80f3d496c6d0bc61b5364cf3abb6..182cde345ca8b0417b52e14619f41b460c657d4f 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -27,7 +27,7 @@ require Exporter;
              print_all_fields cltounix unpad is_callsign is_latlong
                         is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
                         is_prefix dd is_ipaddr $pi $d2r $r2d localdata localdata_mv
-                        diffms _diffms _diffus difft parraydifft is_ztime
+                        diffms _diffms _diffus difft parraydifft is_ztime basecall
             );
 
 
@@ -478,19 +478,20 @@ sub deleteitem
 sub localdata
 {
        my $ifn = shift;
-       my $ofn = "$main::local_data/$ifn";
-       my $tfn;
+       my $lfn = "$main::local_data/$ifn";
+       my $dfn =  "$main::data/$ifn";
        
        if (-e "$main::local_data") {
-               $tfn = "$main::data/$ifn";
-               if ((-e $tfn) && (-e $ofn)) {
-                       $ofn = $tfn if -M $ofn < -M $tfn;
+               if ((-e $dfn) && (-e $lfn)) {
+                       $lfn = $dfn if -M $dfn < -M $lfn;
                } else {
-                       $ofn = $tfn if -e $tfn;
+                       $lfn = $dfn if -e $dfn;
                }
+       } else {
+               $lfn = $dfn;
        }
 
-       return $ofn;
+       return $lfn;
 }
 
 # move a file or a directory from data -> local_data if isn't there already
@@ -588,3 +589,9 @@ sub parraydifft
        $out =~ s/,\s*$//;
        return $out;
 }
+
+sub basecall
+{
+       $_[0] =~ m|^(?:[\w\d]+/)?([\w\d]+).*$|;
+       return $1;
+}