X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=code_ruby%2Flib%2Fmaasha%2Flocator.rb;h=f9fae94890e1a3a01e64165ff535b94a28d743d5;hb=a30677c14f1738f6a76e8c12f2e732cdef9958d6;hp=5996663b0a4cf1c6137bbfd89e1a0d362572f0c5;hpb=b982cc677363d7458963b610ec53bf2c4f7476a9;p=biopieces.git

diff --git a/code_ruby/lib/maasha/locator.rb b/code_ruby/lib/maasha/locator.rb
index 5996663..f9fae94 100644
--- a/code_ruby/lib/maasha/locator.rb
+++ b/code_ruby/lib/maasha/locator.rb
@@ -35,7 +35,7 @@ class Locator
   def initialize(locator, seq)
     @locator = locator
     @seq     = seq
-    @subseq  = Seq.new(nil, "", "dna")
+    @subseq  = Seq.new(seq: "", type: :dna)
     parse_locator(locator)
   end
 
@@ -107,7 +107,7 @@ class Locator
           int_beg = $1.to_i - 1
           int_end = $2.to_i - 1
 
-          newseq = Seq.new(nil, @seq.seq[int_beg..int_end], "dna")
+          newseq = Seq.new(seq: @seq.seq[int_beg..int_end], type: :dna)
 
 					unless newseq.seq.nil?
 						newseq.reverse!.complement! if comp
@@ -117,7 +117,7 @@ class Locator
         when /^(\d+)$/
           pos = $1.to_i - 1
 
-          newseq = Seq.new(nil, @seq.seq[pos], "dna")
+          newseq = Seq.new(seq: @seq.seq[pos], type: :dna)
 
 					unless newseq.seq.nil?
           	newseq.reverse!.complement! if comp 
@@ -125,7 +125,7 @@ class Locator
           	@subseq.seq << (order ? " " + newseq.seq : newseq.seq)
 					end
         else
-          $stderr.puts "WARNING: Could not match locator -> #{locator}";
+          $stderr.puts "WARNING: Could not match locator ->#{locator}<-";
           @subseq.seq << ""
         end
       end