fixed dna/DNA bug in Align.pm

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

diff --git a/bp_bin/bowtie_seq b/bp_bin/bowtie_seq
index dc8b09e11fa71f11b7935ccc91f07ccc47d60453..6c1659beff72acffc2fecde840f9b8166a8555c0 100755 (executable)
--- a/bp_bin/bowtie_seq
+++ b/bp_bin/bowtie_seq
@@ -160,6 +160,7 @@ sub bowtie2biopiece
     $record->{ 'SCORES' }     = $entry->[ 5 ];
     $record->{ 'SCORE' }      = $entry->[ 6 ] + 1;
     $record->{ 'DESCRIPTOR' } = $entry->[ 7 ];
+    $record->{ 'S_LEN' }      = length $entry->[ 4 ];
     $record->{ 'SEQ_LEN' }    = length $entry->[ 4 ];
     $record->{ 'S_END' }      = $record->{ 'S_BEG' } + $record->{ 'SEQ_LEN' } - 1;
     $record->{ 'SCORES' }     =~ s/(.)/ord( $1 ) - 33 . ";"/ge; # http://maq.sourceforge.net/fastq.shtml

diff --git a/code_perl/Maasha/Align.pm b/code_perl/Maasha/Align.pm
index 55b4c2f9f0f6b9a698aa1278317a1599626479e4..622846dc9c374117fb41d588d571f6dd550cd9b3 100644 (file)
--- a/code_perl/Maasha/Align.pm
+++ b/code_perl/Maasha/Align.pm
@@ -480,9 +480,9 @@ sub align_tile
 
         $type = Maasha::Seq::seq_guess_type( $seq1 );
 
-        if ( $type eq "rna" ) {
+        if ( $type =~ /rna/i ) {
             $seq2 = Maasha::Seq::rna_revcomp( $seq1 );
-        } elsif ( $type eq "dna" ) {
+        } elsif ( $type =~ /dna/i ) {
             $seq2 = Maasha::Seq::dna_revcomp( $seq1 );
         } else {
             Maasha::Common::error( qq(Bad sequence type->$type) );

diff --git a/code_perl/Maasha/XHTML.pm b/code_perl/Maasha/XHTML.pm
index 4aeba311eb558c0530224769920893e5cf657e3d..44a72ba182bbc161c0be688ae548833b7dd1e730 100755 (executable)
--- a/code_perl/Maasha/XHTML.pm
+++ b/code_perl/Maasha/XHTML.pm
@@ -622,7 +622,7 @@ sub mailto
 }
 
 
-# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> IMG <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> IMG & OBJECT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 sub img
@@ -640,6 +640,21 @@ sub img
 }
 
 
+sub object
+{
+    # Martin A. Hansen, October 2009.
+
+    # HTML <object> element
+
+    my ( %args,
+       ) = @_;
+
+    # Returns string
+
+    return &tag_single( "object", \%args );
+}
+
+
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> DIV & SPAN <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<