X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bp_bin%2Fcompute;h=0bcd6ca9fe6bea499411b1dc207bfcbc4a2bd64e;hb=2f0fd91b461033529a4a72e161bd133252a22eb6;hp=52ef66d0b2a7c1a2539bad8814bd641523c4d903;hpb=9a92dc906b4bc897c4bdbde5e9a020384b35319f;p=biopieces.git

diff --git a/bp_bin/compute b/bp_bin/compute
index 52ef66d..0bcd6ca 100755
--- a/bp_bin/compute
+++ b/bp_bin/compute
@@ -64,17 +64,16 @@ while ( $record = Maasha::Biopieces::get_record( $in ) )
 
         map { $eval_val =~ s/\Q$_\E/$record->{ $_ }/g } @keys;
 
-
-        if ( $eval_val !~ /\s/)
-        {
-            $record->{ $eval_key } = $eval_val;
-        }
-        else
+        if ( $eval_val =~ /\+|\-|\*|\// or $eval_val =~ /\s+x\s+/)
         {
             $record->{ $eval_key } = eval "$eval_val";
             Maasha::Common::error( qq(eval "$eval_key = $eval_val" failed -> $@) ) if $@;
             $record->{ $eval_key } = sprintf( $options->{ 'format' }, $record->{ $eval_key } ) if $options->{ 'format' };
         }
+        else
+        {
+            $record->{ $eval_key } = $eval_val;
+        }
     }
     else
     {