X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=b8ff16d1b3ba50605316a2f645f85e9929e6d5a2;hb=78fcd88c563bc8f05c9f590cdfc0739129c7efda;hp=96f0cb83af1b1e9ae1c3345356bed26a9e0c104e;hpb=36cf78e5660c745f32be2f1d63be738a0c537c48;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 96f0cb83..b8ff16d1 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -599,16 +599,15 @@ sub parraydifft
 
 sub basecall
 {
-	my ($r) = $_[0] =~ m|^(?:[\w\d]+/)?([\w\d]+).*$|;
+	my ($r) = $_[0] =~ m{^((?:[\w\d]+/)?[\w\d]+(?:/[\w\d]+)*)(?:-\d+)?(?:-\#)?$};
 	return $r;
 }
 
 sub normalise_call
 {
-	my ($c, $ssid) = $_[0] =~ m|^((?:[\w\d]+/)?[\d\w]+(?:/[\w\d]+)?)-?(\d+)?$|;
+	my ($c, $ssid) = $_[0] =~ m|^((?:[\w\d]+/)?[\d\w]+(?:/[\w\d]+)*)(?:-(\d+))?(?:-\#)?$|;
 	my $ncall = $c;
 	$ssid += 0;
 	$ncall .= "-$ssid" if $ssid;
 	return $ncall;
-	
 }