きたです．
> 行きの新幹線で作ってみました．
> もうちょっと詰めたいのでパッチは今夜．
ということでパッチです．
# なんか daily パッチですな．しかも毎回毎回アプローチが異るという…
Index: tdiary.rb
===================================================================
RCS file: /cvsroot/tdiary/core/tdiary.rb,v
retrieving revision 1.150
diff -u -r1.150 tdiary.rb
--- tdiary.rb 10 Oct 2003 07:07:23 -0000 1.150
+++ tdiary.rb 23 Oct 2003 14:04:21 -0000
@@ -7,7 +7,7 @@
You can redistribute it and/or modify it under GPL2.
=end
-TDIARY_VERSION = '1.5.5.20031010'
+TDIARY_VERSION = '1.5.5.20031011'
require 'cgi'
begin
@@ -840,8 +840,9 @@
# load and apply rhtmls
if cache_enable?( prefix ) then
- r = File::open( "#{cache_path}/#{cache_file( prefix )}" ) {|f| f.read }
- else
+ r = File::open( "#{cache_path}/#{cache_file( prefix )}" ) {|f| f.read } rescue nil
+ end
+ if r.nil?
files = ["header.rhtml", @rhtml, "footer.rhtml"]
rhtml = files.collect {|file|
path = "#{PATH}/skel/#{prefix}#{file}"
@@ -907,10 +908,14 @@
def store_cache( cache, prefix )
unless FileTest::directory?( cache_path ) then
- Dir::mkdir( cache_path )
+ begin
+ Dir::mkdir( cache_path )
+ rescue Errno::EEXIST
+ end
end
if cache_file( prefix ) then
File::open( "#{cache_path}/#{cache_file( prefix )}", 'w' ) do |f|
+ f.flock(File::LOCK_EX)
f.write( cache )
end
end
@@ -927,7 +932,10 @@
require 'pstore'
unless FileTest::directory?( cache_path ) then
- Dir::mkdir( cache_path )
+ begin
+ Dir::mkdir( cache_path )
+ rescue Errno::EEXIST
+ end
end
file = date.strftime( "#{cache_path}/%Y%m.parser" )
@@ -941,10 +949,16 @@
PStore::new( file ).transaction do |cache|
begin
unless obj then # restore
- obj = cache[key]
+ ver = cache.root?('version') ? cache['version'] : nil
+ if ver == TDIARY_VERSION and cache.root?(key)
+ obj = cache[key]
+ else
+ clear_cache
+ end
cache.abort
else # store
cache[key] = obj
+ cache['version'] = TDIARY_VERSION
end
rescue PStore::Error
end
|