hflr 1.2.1 → 1.2.3

data/hflr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hflr}
-  s.version = "1.2.1"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Davis"]

data/lib/hflr/fl_record_file.rb

@@ -31,10 +31,12 @@ class FLRFile
   end
       if @fast
        @width = get_record_width_from_file
+       puts "record width: #{@width}"
 
-       records_to_take =  50000001 / @width
+       records_to_take =  100000000 / @width
 
        @buffer_size = @width * records_to_take       
+       puts "buffer size: #{@buffer_size}"
 
        @position=0
        @current_buffer=nil
@@ -100,19 +102,25 @@ def fast_get_next_known_line_type
   unless @current_buffer.nil? && (@offsets.nil? ||  @offsets.empty?)
     if @current_buffer.nil?
       chunk = @offsets.shift
+      puts "About to read chunk #{chunk.inspect}"
       
     @file.pos =  chunk.pos
     @current_buffer=@file.read(chunk.width)        
+    puts "current_buffer set to #{@current_buffer}"
           record= @current_buffer.slice(@position,@width)
+          puts "Got record #{record}"
 
           @position += @width         
+          puts "position: #{@position}"
           if @position >= @current_buffer.size
+            puts "Reseting buffer"
                     @current_buffer = nil 
                     @position=0
                     end                             
           return record
     else
       record= @current_buffer.slice(@position,@width)     
+      puts "Got subsequent record #{record}"
       @position += @width
       if @position>=@current_buffer.size
         @position=0
@@ -195,11 +203,13 @@ def offsets_to_read(ranges, width)
     while !offsets.empty?
       taken << offsets.shift
       if taken.size * width == @buffer_size  || offsets.empty?
-        chunks << chunk.new(taken.first, taken.size * width)
+      
+        chunks << chunk.new(taken.first * @width, taken.size * width)
         taken = []       
       end # if
     end # while              
   end # each
+  
   chunks   
 end
 

metadata

@@ -2,7 +2,7 @@
 name: hflr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors: 
   - Colin Davis