fixed encoding bug in read_454

git-svn-id: http://biopieces.googlecode.com/svn/trunk@2257 74ccb610-7750-0410-82ae-013aeee3265d

diff --git a/bp_bin/read_454 b/bp_bin/read_454
index 5017cd831987c81e1e7699d6b22bf98dea67ad65..96c6a4f0f8bdec096e9b85530dd71055b6dd47c7 100755 (executable)
--- a/bp_bin/read_454
+++ b/bp_bin/read_454
@@ -130,7 +130,7 @@ sub get_qual
     $qual =~ tr/ \n\r/;;;/;
     $qual =~ s/;;/;/g;
 
-    $scores = Maasha::Fastq::dec_str2solexa_str( $qual );
+    $scores = Maasha::Fastq::dec_str2phred_str( $qual );
 
     $entry = [ $name, $scores ];
 

diff --git a/bp_test/test_all b/bp_test/test_all
index e94395f84dbdc2324b8f5c09d080dfd1142fa706..fd358e7bae2f1b8d86e90d5057e976be30d137f4 100755 (executable)
--- a/bp_test/test_all
+++ b/bp_test/test_all
@@ -21,7 +21,9 @@ test_aux_program "blastall"
 test_aux_program "blat"
 test_aux_program "bwa"
 test_aux_program "bowtie"
+test_aux_program "bowtie2"
 test_aux_program "formatdb"
+test_aux_program "hmmsearch"
 test_aux_program "gnuplot"
 test_aux_program "idba"
 test_aux_program "muscle"

diff --git a/code_perl/Maasha/Fastq.pm b/code_perl/Maasha/Fastq.pm
index b48279c24781b3722cbae9976c776eeb25639eec..d70bf3e6cbbf2675e47feec6523976ae92c7bc9e 100644 (file)
--- a/code_perl/Maasha/Fastq.pm
+++ b/code_perl/Maasha/Fastq.pm
@@ -443,6 +443,23 @@ sub dec_str2solexa_str
     return $scores;
 }
 
+sub dec_str2phred_str
+{
+    # Martin A. Hansen, November 2013.
+
+    # Converts a ; separated string of decimal scores to a
+    # string of Phred scores.
+
+    my ( $scores,   # Decimal score string
+       ) = @_;
+
+    # Returns a string.
+
+    $scores =~ s/(-\d{1,2})/0/g;
+    $scores =~ s/(\d{1,2});?/dec2phred( $1 )/eg;
+
+    return $scores;
+}
 
 sub get_entry
 {