data-ids can now include characters such as -. Any non-whitespace works

This commit is contained in:
Dima Kogan 2011-12-27 16:46:30 -08:00
parent 63205188b5
commit 7559ed5f66

View File

@ -388,7 +388,7 @@ sub mainThread
my $numRE = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?'; my $numRE = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?';
# a point may be preceded by an id # a point may be preceded by an id
my $pointRE = $options{dataid} ? '(\w+)\s+' : '()'; my $pointRE = $options{dataid} ? '(\S+)\s+' : '()';
$pointRE .= '(' . join('\s+', ($numRE) x $valuesPerPoint) . ')'; $pointRE .= '(' . join('\s+', ($numRE) x $valuesPerPoint) . ')';
$pointRE = qr/$pointRE/; $pointRE = qr/$pointRE/;