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

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 7067c359..b8ff16d1 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -599,13 +599,13 @@ sub parraydifft
 
 sub basecall
 {
-	my ($r) = $_[0] =~ m{^((?:[\w\d]+/)?[\w\d]+(?:/[\w\d]+)?)(?:-\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;