[BioRuby-cvs] bioruby/lib/bio/io flatfile.rb,1.46,1.47

[Naohisa Goto]

Update of /home/repository/bioruby/bioruby/lib/bio/io
In directory pub.open-bio.org:/tmp/cvs-serv28535/lib/bio/io

Modified Files:
	flatfile.rb 
Log Message:
* Removed duplicated initializing of @path in BufferedInputStream#initialize.
* Fiexed a bug that buffered input stream was nested.


Index: flatfile.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/io/flatfile.rb,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** flatfile.rb	22 Feb 2006 10:01:27 -0000	1.46
--- flatfile.rb	3 Mar 2006 08:18:49 -0000	1.47
***************
*** 35,39 ****
          # initialize prefetch buffer
          @buffer = ''
-         @path = path
        end
  
--- 35,38 ----
***************
*** 519,529 ****
      def initialize(dbclass, stream)
        # 2nd arg: IO object
!       if @stream.kind_of?(BufferedInputStream)
          @stream = stream
        else
          @stream = BufferedInputStream.for_io(stream)
        end
-       # default is raw mode
-       self.raw = false
        # 1st arg: database class (or file format autodetection)
        if dbclass then
--- 518,526 ----
      def initialize(dbclass, stream)
        # 2nd arg: IO object
!       if stream.kind_of?(BufferedInputStream)
          @stream = stream
        else
          @stream = BufferedInputStream.for_io(stream)
        end
        # 1st arg: database class (or file format autodetection)
        if dbclass then
***************
*** 535,538 ****
--- 532,537 ----
        @skip_leader_mode = :firsttime
        @firsttime_flag = true
+       # default raw mode is false
+       self.raw = false
      end
  
***************
*** 743,747 ****
            self.new(*arg)
          end
!           
          # Creates a new element.
          def initialize
--- 742,746 ----
            self.new(*arg)
          end
!         
          # Creates a new element.
          def initialize