update.

[chise/ruby.git] / chise / character.rb

diff --git a/chise/character.rb b/chise/character.rb
index 76039bb..6fb8fbf 100755 (executable)
--- a/chise/character.rb
+++ b/chise/character.rb
@@ -90,8 +90,8 @@ module CHISE
     def []=(k,v)
       f = normalize_feature_name(k)
       cd = ChiseDB.instance
     def []=(k,v)
       f = normalize_feature_name(k)
       cd = ChiseDB.instance

-      ft = cd.get_feature(f)
-      ft.set_value(@char_id, v)
+      feature = cd.get_feature(f)
+      feature.set_value(@char_id, v)

       @feature[f] = v;
     end
 
       @feature[f] = v;
     end
 

@@ -115,14 +115,16 @@ module CHISE
 
     def each_feature
       cd = ChiseDB.instance
 
     def each_feature
       cd = ChiseDB.instance

-      cd.each_feature {|f|
-       ft = cd.get_feature(f)
+      #return
+      cd.each_feature_name {|f|
+       #p f
+       feature = cd.get_feature(f)

        begin
        begin

-         v = ft.get_value(@char_id)
+         v = feature.get_value(@char_id)

          next if v.nil?
          yield(f, v)
        ensure
          next if v.nil?
          yield(f, v)
        ensure

-         ft.close
+         feature.close # important

        end
       }
     end
        end
       }
     end

@@ -139,7 +141,7 @@ module CHISE
 
     def get_feature(f)
       cd = ChiseDB.instance
 
     def get_feature(f)
       cd = ChiseDB.instance

-      cd.load_feature(f, @char_id)
+      cd.load_feature(@char_id, f)

     end
 
     def normalize_feature_name(a)
     end
 
     def normalize_feature_name(a)