odba 1.0.8 → 1.0.9

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.9 / 15.03.2013
+
+* Update dictionary to be suitable for new tsearch2
+  - generate_dictionary API is changed.
+  - generate_dictionary needs dict source files(dict, affix, stop)
+    into /usr/share/postgresql/tsearch_data.
+
 === 1.0.8 / 09.01.2012
 
 * Added exclusive control to update @accessed_by Hash variable in CacheEntry class using mutex (Patinfo-Invoice Error)

data/lib/odba/storage.rb

@@ -112,22 +112,26 @@ CREATE TABLE collection (
       self.dbi.select_all(sql, id)
     end
     def create_dictionary_map(language)
-      %w{lhword lpart_hword lword}.each { |token|
-        self.dbi.do <<-SQL
-          INSERT INTO pg_ts_cfgmap (ts_name, tok_alias, dict_name)
-          VALUES ('default_#{language}', '#{token}',
-          '{#{language}_ispell,#{language}_stem}')
-        SQL
-      }
-      [ 'url', 'host', 'sfloat', 'uri', 'int', 'float', 'email',
-        'word', 'hword', 'nlword', 'nlpart_hword', 'part_hword',
-        'nlhword', 'file', 'uint', 'version' 
-      ].each { |token|
-        self.dbi.do <<-SQL
-          INSERT INTO pg_ts_cfgmap (ts_name, tok_alias, dict_name)
-          VALUES ('default_#{language}', '#{token}', '{simple}')
-        SQL
-      }
+      self.dbi.do <<-SQL
+        ALTER TEXT SEARCH CONFIGURATION default_#{language}
+        ALTER MAPPING FOR
+          asciiword, asciihword, hword_asciipart,
+          word, hword, hword_part, hword_numpart,
+          numword, numhword
+        WITH #{language}_ispell, #{language}_stem;
+      SQL
+      self.dbi.do <<-SQL
+        ALTER TEXT SEARCH CONFIGURATION default_#{language}
+        ALTER MAPPING FOR
+          host, file, int, uint, version
+        WITH simple;
+      SQL
+      # drop from default setting
+      self.dbi.do <<-SQL
+      ALTER TEXT SEARCH CONFIGURATION default_#{language}
+          DROP MAPPING FOR
+          email, url, url_path, sfloat, float
+      SQL
     end
     def create_condition_index(table_name, definition)
       self.dbi.do <<-SQL
@@ -292,35 +296,32 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
       SQL
       self.dbi.select_all(sql, origin_id)
     end
-    def generate_dictionary(language, locale, dict_dir)
+    def generate_dictionary(language, data_path='/usr/share/postgresql/tsearch_data/', file='fulltext')
+      found = true
+      %w{dict affix stop}.each do |ext|
+        filename = "#{file}.#{ext}"
+        source   = File.join(data_path, filename)
+        unless File.exists?(source)
+          puts "ERROR:  \"#{filename}\" does not exist in #{data_path}."
+          found = false
+        end
+      end
+      return unless found
       # setup configuration
       self.dbi.do <<-SQL
-        INSERT INTO pg_ts_cfg (ts_name, prs_name, locale)
-        VALUES ('default_#{language}', 'default', '#{locale}');
-      SQL
-      # insert path to dictionary
-      sql = <<-SQL
-        INSERT INTO pg_ts_dict (
-          SELECT '#{language}_ispell', dict_init, ?, dict_lexize
-          FROM pg_ts_dict
-          WHERE dict_name = 'ispell_template'
-        );
+        CREATE TEXT SEARCH CONFIGURATION public.default_#{language} ( COPY = pg_catalog.#{language} );
       SQL
-      prepath = File.expand_path("fulltext", dict_dir)
-      path = %w{Aff Dict Stop}.collect { |type|
-        sprintf('%sFile="%s.%s"', type, prepath, type.downcase)
-      }.join(',')
-      sth.do sql, path
-      create_dictionary_map(language)
+      # ispell
       self.dbi.do <<-SQL
-        INSERT INTO pg_ts_dict (
-          dict_name, dict_init, dict_lexize
-        )
-        VALUES (
-          '#{language}_stem', 'dinit_#{language}(internal)',
-          'snb_lexize(internal, internal, int4)'
+        CREATE TEXT SEARCH DICTIONARY #{language}_ispell (
+          TEMPLATE  = ispell,
+          DictFile  = #{file},
+          AffFile   = #{file},
+          StopWords = #{file}
         );
       SQL
+      # stem is already there.
+      create_dictionary_map(language)
     end
     def index_delete_origin(index_name, odba_id, term)
       self.dbi.do <<-SQL, odba_id, term
@@ -412,18 +413,11 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
     def remove_dictionary(language)
       # remove configuration
       self.dbi.do <<-SQL
-        DELETE FROM pg_ts_cfg
-        WHERE ts_name='default_#{language}'
-      SQL
-      # remove dictionaries
-      self.dbi.do <<-SQL
-        DELETE FROM pg_ts_dict
-        WHERE dict_name IN ('#{language}_ispell', '#{language}_stem')
+        DROP TEXT SEARCH CONFIGURATION IF EXISTS default_#{language}
       SQL
-      # remove tokens
+      # remove ispell dictionaries
       self.dbi.do <<-SQL
-        DELETE FROM pg_ts_cfgmap
-        WHERE ts_name='default_#{language}'
+        DROP TEXT SEARCH DICTIONARY IF EXISTS #{language}_ispell;
       SQL
     end
 		def restore(odba_id)

data/lib/odba.rb

@@ -11,5 +11,5 @@ require 'odba/index'
 require 'odba/odba'
 
 class Odba
-    VERSION = '1.0.8'
+    VERSION = '1.0.9'
 end

metadata

@@ -1,57 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: odba
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 1.0.9
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 8
-  version: 1.0.8
 platform: ruby
-authors: 
+authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-09 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+date: 2013-03-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &5759020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *5759020
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &6140080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
-        version: 2.9.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *6140080
 description: Object Database Access - Ruby Software for ODDB.org Memory Management
-email: 
+email:
 - mhatakeyama@ywesee.com, zdavatz@ywesee.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Guide.txt
 - History.txt
 - LICENSE.txt
-- Manifest.txt
 - README.txt
-files: 
+files:
 - Guide.txt
 - History.txt
 - LICENSE.txt
-- Manifest.txt
 - README.txt
 - Rakefile
 - install.rb
@@ -88,42 +83,33 @@ files:
 - test/test_storage.rb
 - test/test_stub.rb
 - .gemtest
-has_rdoc: true
 homepage: http://scm.ywesee.com/?p=odba/.git;a=summary
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: odba
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Object Database Access - Ruby Software for ODDB.org Memory Management
-test_files: 
+test_files:
 - test/test_array.rb
 - test/test_cache.rb
 - test/test_cache_entry.rb

data/Manifest.txt

@@ -1,39 +0,0 @@
-Guide.txt
-History.txt
-LICENSE.txt
-Manifest.txt
-README.txt
-Rakefile
-install.rb
-lib/odba.rb
-lib/odba/18_19_loading_compatibility.rb
-lib/odba/cache.rb
-lib/odba/cache_entry.rb
-lib/odba/connection_pool.rb
-lib/odba/drbwrapper.rb
-lib/odba/id_server.rb
-lib/odba/index.rb
-lib/odba/index_definition.rb
-lib/odba/marshal.rb
-lib/odba/odba.rb
-lib/odba/odba_error.rb
-lib/odba/persistable.rb
-lib/odba/storage.rb
-lib/odba/stub.rb
-sql/collection.sql
-sql/create_tables.sql
-sql/object.sql
-sql/object_connection.sql
-test/suite.rb
-test/test_array.rb
-test/test_cache.rb
-test/test_cache_entry.rb
-test/test_connection_pool.rb
-test/test_drbwrapper.rb
-test/test_hash.rb
-test/test_id_server.rb
-test/test_index.rb
-test/test_marshal.rb
-test/test_persistable.rb
-test/test_storage.rb
-test/test_stub.rb