projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix RBN (and other) basecall issues
[spider.git]
/
perl
/
DXUtil.pm
diff --git
a/perl/DXUtil.pm
b/perl/DXUtil.pm
index 96f0cb83af1b1e9ae1c3345356bed26a9e0c104e..7067c359d54892bbf7c935fc6fa67ecd43f107de 100644
(file)
--- a/
perl/DXUtil.pm
+++ b/
perl/DXUtil.pm
@@
-599,16
+599,15
@@
sub parraydifft
sub basecall
{
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
{
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;
my $ncall = $c;
$ssid += 0;
$ncall .= "-$ssid" if $ssid;
return $ncall;
-
}
}