update.

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

diff --git a/chise/chisedb.rb b/chise/chisedb.rb
index d2dfa7d..b7124e6 100755 (executable)
--- a/chise/chisedb.rb
+++ b/chise/chisedb.rb
@@ -8,17 +8,24 @@ module CHISE
     include Singleton
 
     def initialize
-      @ds = DataSource.new
+      db_dir = CHISE::DataSource::DB_DIR
+      @ds = DataSource.new(CHISE::DataSource::Berkeley_DB, db_dir, 0, 0755)
       @byids_db = {}
     end
 
     def location() @ds.location; end
+
     def get_feature(f) @ds.get_feature(f) end
+
     def get_ccs(c) @ds.get_ccs(c) end
+
     def decode_char(n, cid) @ds.decode_char(n, cid) end
+
     def load_feature(n, cid) @ds.load_feature(n, cid) end
-    def each_feature() @ds.each_feature {|f| yield f } end
-    def each_ccs() @ds.each_ccs {|c| yield c } end
+
+    def each_feature_name() @ds.each_feature_name {|f| yield f } end
+
+    #def each_ccs() @ds.each_ccs {|c| yield c } end
 
     def get_by_ids_db(n)
       @byids_db[n] = ByIDS_DB.new(@ds, n) if @byids_db[n].nil?
@@ -26,6 +33,17 @@ module CHISE
     end
   end
 
+  class FeatureDB
+    def initialize(ds, name)
+      @ds, @name = ds, name
+    end
+    
+  end
+
+  class CCS_DB
+  end
+
+
   class ByIDS_DB
     include ChiseValue
     include TableAccessModule