[Madeleine-commit] madeleine/lib madeleine.rb,1.43,1.44

[Anders B. <nd...@us...>]

Update of /cvsroot/madeleine/madeleine/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3236/lib

Modified Files:
	madeleine.rb 
Log Message:
Replaced CommandLog's inheritance of NumberedFile with delegation.

Index: madeleine.rb
===================================================================
RCS file: /cvsroot/madeleine/madeleine/lib/madeleine.rb,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** madeleine.rb	27 Jun 2004 20:18:52 -0000	1.43
--- madeleine.rb	19 Jul 2004 17:01:12 -0000	1.44
***************
*** 250,254 ****
    end
  
!   class CommandLog < NumberedFile #:nodoc:
  
      def self.log_file_names(directory_name)
--- 250,254 ----
    end
  
!   class CommandLog #:nodoc:
  
      def self.log_file_names(directory_name)
***************
*** 264,269 ****
      def initialize(path)
        id = CommandLog.highest_log(path) + 1
!       super(path, "command_log", id)
!       @file = open(name, 'wb')
      end
  
--- 264,269 ----
      def initialize(path)
        id = CommandLog.highest_log(path) + 1
!       numbered_file = NumberedFile.new(path, "command_log", id)
!       @file = open(numbered_file.name, 'wb')
      end
  
***************
*** 361,367 ****
      def self.highest_id(directory_name)
        return 0 unless File.exist?(directory_name)
        highest = 0
        Dir.foreach(directory_name) {|file_name|
!         match = /^(\d{#{FILE_COUNTER_SIZE}}\.snapshot$)/.match(file_name)
          next unless match
          n = match[1].to_i
--- 361,368 ----
      def self.highest_id(directory_name)
        return 0 unless File.exist?(directory_name)
+       suffix = "snapshot"
        highest = 0
        Dir.foreach(directory_name) {|file_name|
!         match = /^(\d{#{FILE_COUNTER_SIZE}}\.#{suffix}$)/.match(file_name)
          next unless match
          n = match[1].to_i