sekka 1.6.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622a15c6b5630995ddafce667cbcbbe1dacd4111
-  data.tar.gz: fcb2eea0fe4637ecdde0fe712dcd3ecf240e1404
+  metadata.gz: f14974e9acd87ad10f08d88a02162ef21a8c7fff
+  data.tar.gz: c9d7db3ca95a63b316d8089c947ab23424cde502
 SHA512:
-  metadata.gz: 5ad30407caa0d223a4ace33eeb68225f0d9c97ac6c2dca848dfa71c825bf26d0e02135dcd3fb8bd4e2144b21f127fcd84309214e0a8dc9af8425ad41c31f92ce
-  data.tar.gz: ebe4c31be852255ee475969a218fdb90cf2f21aba4037bea298c0cd65d105341b237f913e7bdb2e81d0f742f476fa69869c82f1c7bfe1cc78a5c2b6996398180
+  metadata.gz: 97f809c4c8f84c6a5123a7b71ac6f0698c46d4104b1661eb1428ea557cf9c650f47f324d7b2e2c9dfe16e1e30ad3d4b531fc6dcd1595ac5ee34535b392b6b84e
+  data.tar.gz: 68af3d5572e414b082afb7ec85f2024912387a2df90b43de0f68c098854e1698f6def4c01190141e77099a121e749ea74ba54d246b9c5c23c8f9bd2347c8e91d

data/.gitignore

@@ -4,6 +4,7 @@
 /Gemfile.lock
 /Gemfile~
 /README~
+/jisyo.N.ldb
 /path1.tmp
 /pkg
 /rackup.log

data/.travis.yml

@@ -13,6 +13,3 @@ env:
 
 gemfile:
  - gemfiles/Gemfile
-
-services:
- - memcache

data/Rakefile

@@ -116,7 +116,7 @@ task :test do
     files << "./test/henkan-main.nnd  leveldb"
   end
   files.each {|filename|
-    sh  sprintf( "ruby -I ./lib -S nendo -I ./lib -d %s", filename )
+    sh  sprintf( "export RUBY_THREAD_VM_STACK_SIZE=100000 ; ruby -I ./lib -S nendo -I ./lib -d %s", filename )
   }
   sh "cat test.record"
 end
@@ -152,6 +152,10 @@ task :dump do
   sh sprintf( "ruby ./bin/sekka-jisyo dump    ./data/SEKKA-JISYO.N.tch#xmsiz=1024m > ./data/SEKKA-JISYO-%s.N.tsv", dictVersion )
 end
 
+task :restore do
+  sh sprintf("export RUBY_THREAD_VM_STACK_SIZE=100000 ; ruby -I ./lib ./bin/sekka-jisyo restore  ./data/SEKKA-JISYO-%s.N.tsv jisyo.N.ldb", dictVersion )
+end
+
 task :load_leveldb do
   sh sprintf( "ruby ./bin/sekka-jisyo load    ./data/SEKKA-JISYO.N  ./data/SEKKA-JISYO-%s.N.ldb", dictVersion )
   sh sprintf( "tar zcCf ./data ./data/SEKKA-JISYO-%s.N.ldb.tar.gz ./SEKKA-JISYO-%s.N.ldb" , dictVersion, dictVersion )

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
-:minor: 6
-:patch: 6
+:minor: 7
+:patch: 0

data/emacs/sekka.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
 ;; Author: Kiyoka Nishiyama <kiyoka@sumibi.org>
-;; Version: 1.6.6          ;;SEKKA-VERSION
+;; Version: 1.7.0          ;;SEKKA-VERSION
 ;; Keywords: ime, skk, japanese
 ;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.2"))
 ;; URL: https://github.com/kiyoka/sekka
@@ -1756,7 +1756,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.6.6" ;;SEKKA-VERSION
+  "1.7.0" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/gemfiles/Gemfile

@@ -3,7 +3,7 @@ gem "eventmachine"
 gem "jeweler2"
 gem "rspec"
 gem "distributed-trie"
-gem "memcache-client"
+gem "memcachepod"
 gem "nendo"
 gem "json"
 gem "rake"

data/lib/sekka/henkan.nnd

@@ -386,19 +386,32 @@
 
 
 ;; conversion #f => nil for EmacsLisp
-(define (sekkaHenkan userid kvs cachesv keyword limit roman-method)
+(define (sekkaHenkan userid kvs cachesv keyword limit roman-method emacs-mode)
   (define cache-exp-second (* 10 60))
   (let* ((keyword (keyword.strip))
-         (sekka-keyword (+ "sekka:" roman-method ":" (limit.to_s) ":" keyword)))
+         (sekka-keyword (+ "sekka:" roman-method ":" (limit.to_s) ":" (if emacs-mode "sexp" "json") ":" keyword)))
     (if-let1 fetched (and cachesv
                           (cachesv.get sekka-keyword #f))
       (begin
         keyword
         (read-from-string fetched))
-      (let1 henkan-result (map
-                           (lambda (x)
-                             (map (lambda (val) (if val val nil)) x))
-                           (sekka-henkan userid kvs keyword limit (make-keyword roman-method)))
+      (let*
+          ((henkan-result-tmp
+            (sekka-henkan userid kvs keyword limit (make-keyword roman-method)))
+           (henkan-result
+            (if emacs-mode
+                (map
+                 (lambda (x)
+                   (map (lambda (val)
+                          (if val val nil))
+                        x))
+                 henkan-result-tmp)
+                (list->vector 
+                 (map
+                  (lambda (x)
+                    (list->vector x))
+                  henkan-result-tmp)))))
+
         (and cachesv
              (not (null? henkan-result))
              (let1 fetched2 (cachesv.get  "sekka:(keys)" #f)

data/lib/sekka/kvs.rb

@@ -31,7 +31,7 @@
 #
 #  $Id:
 #
-require 'memcache'
+require 'memcachepod'
 
 class Kvs
   def initialize( dbtype )
@@ -110,9 +110,7 @@ class Kvs
     when :redis
       @db = Redis.new( :host => name )
     when :memcache
-      @db = MemCache.new( name,
-                          :connect_timeout => 1000.0,
-                          :timeout => 1000.0 )
+      @db = MemcachePod::Client.new( name, { :expires_in => 600 } )
     when :gdbm
       if not name.match( /.db$/ )
         name = name + ".db"
@@ -175,11 +173,17 @@ class Kvs
     if 0 == key.size
       fallback
     else
-      val = @db[ key ]
+      val = ''
+      case @dbtype
+      when :memcache
+        val = @db.get(key.force_encoding("ASCII-8BIT"))
+      else
+        val = @db[ key ]
+      end
       if val
-        val.force_encoding("UTF-8")
+        return val.force_encoding("UTF-8")
       else
-        fallback
+        return fallback
       end
     end
   end

data/lib/sekka/roman-lib.nnd

@@ -360,7 +360,7 @@
 
 ;; 子音が2音入ったテーブル
 (define sekka-kana->roman-alist-long
-  `(
+  '(
     ;; "n" 一つで "nn" を表現する件と被るのでAZIK専用拡張とする(エントリ上書き)
     ("にゃ"      "nya"                                "nga")
     ("にゅ"      "nyu"                                "ngu")
@@ -711,12 +711,19 @@
 
 ;; ハッシュテーブル  ローマ字 =>平仮名
 (define (sekka-alist-swap alist)
-  (append-map
-   (lambda (x)
-     (let ((hira   (car x))
-           (romans (cdr x)))
-       (map (lambda (r) (list r hira)) romans)))
-   alist))
+  (let1 mapped (map
+                (lambda (x)
+                  (let ((hira   (car x))
+                        (romans (cdr x)))
+                    (map (lambda (r) (list r hira)) romans)))
+                alist)
+    (let1 lst '()
+      (for-each
+       (lambda (x)
+         (for-each (lambda (y) (push! lst y)) (reverse x)))
+       mapped)
+      (reverse lst))))
+
 (define sekka-roman->kana-hash-short
   (alist->hash-table (sekka-alist-swap sekka-kana->roman-alist-short)))
 (define sekka-roman->kana-hash-long

data/lib/sekka/sekkaversion.rb

@@ -1,4 +1,4 @@
 class SekkaVersion
-  def  self.version()     "1.6.6"  end
+  def  self.version()     "1.7.0"  end
   def  self.dictVersion() "1.6.2"  end
 end

data/lib/sekkaserver.rb

@@ -60,12 +60,15 @@ module SekkaServer
       @core.evalStr( "(use sekka.henkan)" )
       @core.evalStr( '(define (writeToString sexp) (write-to-string sexp))' )
       @core.evalStr( '(export-to-ruby writeToString)' )
+      @core.evalStr( "(use rfc.json)" )
+      @core.evalStr( '(define (constructJsonString sexp) (construct-json-string sexp))' )
+      @core.evalStr( '(export-to-ruby constructJsonString)' )
       (@kvs,@initialCachesv) = @core.openSekkaJisyo( SekkaServer::Config.dictType,
                                                       SekkaServer::Config.dictSource,
                                                       SekkaServer::Config.cacheSource )
 
       # connection check to memcached
-      fail_message = "sekka-server: failt to access memcached.\n"
+      fail_message = "sekka-server: failed to access memcached.\n"
       begin
         @core.flushCacheServer(@initialCachesv)
       rescue MemCache::MemCacheError
@@ -100,7 +103,6 @@ module SekkaServer
       STDERR.printf( "  dict  version  : %s\n", SekkaVersion.dictVersion        )
       STDERR.printf( "  dict-type      : %s\n", SekkaServer::Config.dictType    )
       STDERR.printf( "  dict-db        : %s\n", SekkaServer::Config.dictSource  )
-      STDERR.printf( "  memcached      : %s\n", SekkaServer::Config.cacheSource )
       STDERR.printf( "  listenPort     : %s\n", SekkaServer::Config.listenPort  )
       STDERR.printf( "  proxyHost      : %s\n", SekkaServer::Config.proxyHost   )
       STDERR.printf( "  proxyPort      : %s\n", SekkaServer::Config.proxyPort   )
@@ -130,8 +132,8 @@ module SekkaServer
                       STDERR.puts "Info: processing  [register(" + dictline + ") on " + userid + "] batch command... "
                       begin
                         registered = @core.registerUserJisyo(userid, @kvs, dictline)
-                      rescue RuntimeError
-                        STDERR.puts "Info: missing [register(" + dictline + ")] batch command..."
+                      rescue Exception => e
+                        STDERR.puts "Error: missing [register(" + dictline + ")] batch command... [" + e.message + "]"
                       end
                       if registered
                         str = d.strftime( "%D %X" )
@@ -147,17 +149,16 @@ module SekkaServer
                       STDERR.puts "Info: processing  [kakutei(" + _tango + ")] batch command..."
                       begin
                         @core.sekkaKakutei( userid, @kvs, @cachesv, _key, _tango )
-                      rescue RuntimeError
-                        STDERR.puts "Info: missing [kakutei(" + _tango + ")] batch command..."
+                      rescue Exception => e
+                        STDERR.puts "Error: missing   [kakutei(" + _tango + ")] batch command... [" + e.message + "]"
                       end
-
                       STDERR.printf( "Info: kakutei [%s:%s] \n", _key, _tango )
                     when 'f' # flush
                       STDERR.puts "Info: processing [flush] batch command..."
                       begin
                         n = @core.flushUserJisyo( userid, @kvs )
-                      rescue RuntimeError
-                        STDERR.puts "Info: missing [flush] batch command..."
+                      rescue Exception => e
+                        STDERR.puts "Error: missing [flush] batch command... [" + e.message + "]"
                       end
                       @core.flushCacheServer( @cachesv )
                       STDERR.printf( "info : flush [%s] user's dict %d entries. \n", userid, n )
@@ -169,90 +170,31 @@ module SekkaServer
           }
         end
         @thread.run
-      rescue
-        p $!  # => "unhandled exception"
+      rescue Exception => e
+        STDERR.puts "Error: " + e.message  # => "unhandled exception"
       end
     end
 
     def call(env)
       req = Rack::Request.new(env)
-      body = if !req.params.has_key?('userid')
-               str = "Err: POST parameter 'userid' required"
-               STDERR.puts str
-               @core.writeToString( str )
-             elsif !req.params.has_key?('format')
-               str = "Err: POST parameter 'format' required"
-               STDERR.puts str
-               @core.writeToString( str )
-             else
-               case req.request_method
-               when 'POST'
-                 revertMemcache()
-                 
-                 userid = URI.decode( req.params['userid'].force_encoding("UTF-8") )
-                 format = URI.decode( req.params['format'].force_encoding("UTF-8") )
-                 case req.path
-                 when "/henkan"
-                   _yomi    = URI.decode( req.params[  'yomi'].force_encoding("UTF-8") )
-                   _limit   = URI.decode( req.params[ 'limit'].force_encoding("UTF-8") )
-                   _method  = URI.decode( req.params['method'].force_encoding("UTF-8") )
-                   _orRedis = if :redis == SekkaServer::Config.dictType then "or Redis-server" else "" end
-                   @mutex.synchronize {
-                     begin
-                       if SekkaServer::Config.maxQueryLength < _yomi.size
-                         result = sprintf( "sekka-server: query string is too long (over %d character length)", SekkaServer::Config.maxQueryLength )
-                       else
-                         @core.writeToString( @core.sekkaHenkan( userid, @kvs, @cachesv, _yomi, _limit.to_i, _method ))
-                       end
-                     rescue MemCache::MemCacheError
-                       result = "sekka-server: memcached server is down (or may be offline)"
-                       disableMemcache()
-                     rescue Timeout
-                       result = "sekka-server: Timeout to request memcached server #{_orRedis} (or may be offline)"
-                       disableMemcache()
-                     rescue SocketError
-                       result = "sekka-server: SocketError to request memcached server #{_orRedis} (or may be offline)"
-                       disableMemcache()
-                     rescue Errno::ECONNREFUSED
-                       result = "sekka-server: ConnectionRefused to request memcached server #{_orRedis} (or may be offline)"
-                       disableMemcache()
-                     end
-                 }
-                 when "/kakutei"
-                   _key    = URI.decode( req.params[   'key'].force_encoding("UTF-8") )
-                   _tango  = URI.decode( req.params[ 'tango'].force_encoding("UTF-8") )
-                   @queue.push( 'k ' + userid + " " + _key + " " + _tango )
-                 when "/register"
-                   dict    = URI.decode( req.params['dict'].force_encoding( "UTF-8" ) ).split( "\n" )
-                   dict.each { |x|
-                     @queue.push( 'r ' + userid + " " + x )
-                   }
-                   sprintf( "sekka-server:register request (%s) words added, current-queue-size (%s)", dict.size, @queue.size )
-                 when "/flush"
-                   @queue.push( 'f ' + userid )
-                   sprintf( "sekka-server:flush request successful." )
-                 when "/googleime"
-                   _yomi   = URI.decode( req.params[  'yomi'].force_encoding("UTF-8") )
-                   printf( "info : google-ime request [%s]\n", _yomi )
-                   result = "sekka-server: google-ime error"
-                   begin
-                     result = @core.googleIme( _yomi,
-                                               SekkaServer::Config.proxyHost,
-                                               SekkaServer::Config.proxyPort )
-                   rescue Timeout
-                     result = "sekka-server: Timeout to request google-ime (may be offline)"
-                   rescue SocketError
-                     result = "sekka-server: SocketError to request google-ime (may be offline)"
-                   rescue Errno::ECONNREFUSED
-                     result = "sekka-server: ConnectionRefused to request google-ime (or may be offline)"
-                   end
-                   @core.writeToString( result )
-                 else
-                   sprintf( "sekka-server:unknown path name. [%s]", req.path )
-                 end
+
+      body = case req.request_method
+             when 'GET'
+               execGetMethod(req)
+             when 'POST'
+               if !req.params.has_key?('userid')
+                 str = "Err: parameter 'userid' required"
+                 STDERR.puts str
+                 @core.writeToString( str )
+               elsif !req.params.has_key?('format')
+                 str = "Err: parameter 'format' required"
+                 STDERR.puts str
+                 @core.writeToString( str )
                else
-                 "no message."
+                 execPostMethod(req)
                end
+             else
+               "no message."        
              end
       res = Rack::Response.new { |r|
         r.status = 200
@@ -261,22 +203,86 @@ module SekkaServer
       }
       res.finish
     end
-
-    def revertMemcache()
-      now = DateTime.now
-      ## STDERR.printf( "Sekka Debug: [%d]/[%d]\n", @downTime.to_time.to_i, now.to_time.to_i )
-      if not @cachesv
-        if (@downTime.to_time.to_i + (10 * 60)) < now.to_time.to_i
-          @cachesv = @initialCachesv
-          STDERR.printf( "Sekka Info: revert using memcache server. [%s]\n", @downTime )        
-        end
+    
+    def execGetMethod(req)
+      case req.path
+      when "/status"
+        "OK"
       end
     end
     
-    def disableMemcache()
-      @cachesv  = false
-      @downTime = DateTime.now
-      STDERR.printf( "Sekka Warning: disabled using memcache server. [%s]\n", @downTime )
+    def isJson(format)
+      return "json" == format.downcase
+    end
+    
+    def execPostMethod(req)
+                 
+      userid = URI.decode( req.params['userid'].force_encoding("UTF-8") )
+      format = URI.decode( req.params['format'].force_encoding("UTF-8") )
+      case req.path
+      when "/henkan"
+        _yomi    = URI.decode( req.params[  'yomi'].force_encoding("UTF-8") )
+        _limit   = URI.decode( req.params[ 'limit'].force_encoding("UTF-8") )
+        _method  = URI.decode( req.params['method'].force_encoding("UTF-8") )
+        _orRedis = if :redis == SekkaServer::Config.dictType then "or Redis-server" else "" end
+        @mutex.synchronize {
+          begin
+            if SekkaServer::Config.maxQueryLength < _yomi.size
+              result = sprintf( "sekka-server: query string is too long (over %d character length)", SekkaServer::Config.maxQueryLength )
+            else
+              if isJson(format)
+                obj = @core.sekkaHenkan( userid, @kvs, @cachesv, _yomi, _limit.to_i, _method, false )
+                @core.constructJsonString(obj)
+              else
+                obj = @core.sekkaHenkan( userid, @kvs, @cachesv, _yomi, _limit.to_i, _method, true )
+                @core.writeToString(obj)
+              end
+            end
+          rescue MemCache::MemCacheError
+            result = "sekka-server: memcached server is down (or may be offline)"
+          rescue Timeout
+            result = "sekka-server: Timeout to request memcached server #{_orRedis} (or may be offline)"
+          rescue SocketError
+            result = "sekka-server: SocketError to request memcached server #{_orRedis} (or may be offline)"
+          rescue Errno::ECONNREFUSED
+            result = "sekka-server: ConnectionRefused to request memcached server #{_orRedis} (or may be offline)"
+          end
+        }
+      when "/kakutei"
+        _key    = URI.decode( req.params[   'key'].force_encoding("UTF-8") )
+        _tango  = URI.decode( req.params[ 'tango'].force_encoding("UTF-8") )
+        @queue.push( 'k ' + userid + " " + _key + " " + _tango )
+        if isJson(format)
+          sprintf("{}")
+        end
+      when "/register"
+        dict    = URI.decode( req.params['dict'].force_encoding( "UTF-8" ) ).split( "\n" )
+        dict.each { |x|
+          @queue.push( 'r ' + userid + " " + x )
+        }
+        sprintf( "sekka-server:register request (%s) words added, current-queue-size (%s)", dict.size, @queue.size )
+      when "/flush"
+        @queue.push( 'f ' + userid )
+        sprintf( "sekka-server:flush request successful." )
+      when "/googleime"
+        _yomi   = URI.decode( req.params[  'yomi'].force_encoding("UTF-8") )
+        printf( "info : google-ime request [%s]\n", _yomi )
+        result = "sekka-server: google-ime error"
+        begin
+          result = @core.googleIme( _yomi,
+                                    SekkaServer::Config.proxyHost,
+                                    SekkaServer::Config.proxyPort )
+        rescue Timeout
+          result = "sekka-server: Timeout to request google-ime (may be offline)"
+        rescue SocketError
+          result = "sekka-server: SocketError to request google-ime (may be offline)"
+        rescue Errno::ECONNREFUSED
+          result = "sekka-server: ConnectionRefused to request google-ime (or may be offline)"
+        end
+        @core.writeToString( result )
+      else
+        sprintf( "sekka-server:unknown path name. [%s]", req.path )
+      end
     end
   end
 end

data/test/henkan-main.nnd

@@ -1154,87 +1154,96 @@
 
 (test* "henkan toplevel(for Elisp) 1"
        '(("＊" nil "*" j 0) ("※" nil "*" j 1) ("×" nil "*" j 2) ("＊" nil "*" z 3) ("*" nil "*" l 4))
-       (sekkaHenkan userid kvs #f "*" 0 "normal"))
+       (sekkaHenkan userid kvs #f "*" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 2"
        '(("しぜんげんごりか" nil "shizengengorika" h 0) ("シゼンゲンゴリカ" nil "shizengengorika" k 1) ("しぜにぇにょりか" nil "shizengengorika" h 2) ("シゼニェニョリカ" nil "shizengengorika" k 3) ("ｓｈｉｚｅｎｇｅｎｇｏｒｉｋａ" nil "shizengengorika" z 4) ("shizengengorika" nil "shizengengorika" l 5) ("自然言語理解" nil "しぜんげんごりかい" j 6) ("自然言語" nil "しぜんげんご" j 7) ("自然言語処理" nil "しぜんげんごしょり" j 8))
-       (sekkaHenkan userid kvs #f "shizengengorika" 0 "normal"))
+       (sekkaHenkan userid kvs #f "shizengengorika" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 3"
        '(("自然言語理解" nil "しぜんげんごりかい" j 0) ("自然言語" nil "しぜんげんご" j 1) ("自然言語処理" nil "しぜんげんごしょり" j 2) ("しぜんげんごりか" nil "shizengengorika" h 3) ("シゼンゲンゴリカ" nil "shizengengorika" k 4) ("しぜにぇにょりか" nil "shizengengorika" h 5) ("シゼニェニョリカ" nil "shizengengorika" k 6) ("Ｓｈｉｚｅｎｇｅｎｇｏｒｉｋａ" nil "Shizengengorika" z 7) ("Shizengengorika" nil "Shizengengorika" l 8))
-       (sekkaHenkan userid kvs #f "Shizengengorika" 0 "normal"))
+       (sekkaHenkan userid kvs #f "Shizengengorika" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 4"
        '(("変化する" nil "へんかs" j 0) ("へんかする" nil "henkasuru" h 1) ("ヘンカスル" nil "henkasuru" k 2) ("へにんあする" nil "henkasuru" h 3) ("ヘニンアスル" nil "henkasuru" k 4) ("ｈｅｎｋａＳｕｒｕ" nil "henkaSuru" z 5) ("henkaSuru" nil "henkaSuru" l 6))
-       (sekkaHenkan userid kvs #f "henkaSuru" 0 "normal"))
+       (sekkaHenkan userid kvs #f "henkaSuru" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 5"
        '(("変換" nil "へんかん" j 0) ("返還" nil "へんかん" j 1) ("変化" nil "へんか" j 2) ("返歌" nil "へんか" j 3) ("へんかん" nil "henkan" h 4) ("ヘンカン" nil "henkan" k 5) ("へにんあん" nil "henkan" h 6) ("ヘニンアン" nil "henkan" k 7) ("Ｈｅｎｋａｎ" nil "Henkan" z 8) ("Henkan" nil "Henkan" l 9))
-       (sekkaHenkan userid kvs #f "Henkan" 0 "normal"))
+       (sekkaHenkan userid kvs #f "Henkan" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 6"
        '(("マジパネェ" nil "まじぱねぇ" j 0) ("まじパネェ" nil "まじぱねぇ" j 1) ("マジ半端ネェ" nil "まじぱねぇ" j 2) ("まじ半端ネェ" nil "まじぱねぇ" j 3) ("まじぱねえ" nil "majipanee" h 4) ("マジパネエ" nil "majipanee" k 5) ("Ｍａｊｉｐａｎｅｅ" nil "Majipanee" z 6) ("Majipanee" nil "Majipanee" l 7))
-       (sekkaHenkan userid kvs #f "Majipanee" 0 "normal"))
+       (sekkaHenkan userid kvs #f "Majipanee" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 7"
        '(("変換エンジン" nil "へんかんえんじん" j 0) ("変換" nil "へんかん" j 1) ("返還" nil "へんかん" j 2) ("へんかねんじ" nil "henkanenji" h 3) ("ヘンカネンジ" nil "henkanenji" k 4) ("へにんあねぬんい" nil "henkanenji" h 5) ("ヘニンアネヌンイ" nil "henkanenji" k 6) ("Ｈｅｎｋａｎｅｎｊｉ" nil "Henkanenji" z 7) ("Henkanenji" nil "Henkanenji" l 8))
-       (sekkaHenkan userid kvs #f "Henkanenji" 0 "normal"))
+       (sekkaHenkan userid kvs #f "Henkanenji" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 8"
        '(("ブログった" nil "ぶろぐt" j 0) ("ブログった" nil "ぶろぐ+" j 1) ("ブログった" nil "ぶろぐr" j 2) ("ブログった" nil "ぶろぐ`" j 3) ("ぶろぐった" nil "burogutta" h 4) ("ブログッタ" nil "burogutta" k 5) ("ｂｕｒｏｇｕＴｔａ" nil "buroguTta" z 6) ("buroguTta" nil "buroguTta" l 7))
-       (sekkaHenkan userid kvs #f "buroguTta" 0 "normal"))
+       (sekkaHenkan userid kvs #f "buroguTta" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 9"
        '(("ブログりました" nil "ぶろぐr" j 0) ("ブログりました" nil "ぶろぐ+" j 1) ("ブログりました" nil "ぶろぐt" j 2) ("ブログりました" nil "ぶろぐ`" j 3) ("ぶろぐりました" nil "burogurimashita" h 4) ("ブログリマシタ" nil "burogurimashita" k 5) ("ｂｕｒｏｇｕＲｉｍａｓｈｉｔａ" nil "buroguRimashita" z 6) ("buroguRimashita" nil "buroguRimashita" l 7))
-       (sekkaHenkan userid kvs #f "buroguRimashita" 0 "normal"))
+       (sekkaHenkan userid kvs #f "buroguRimashita" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 10"
        '(("はてブ" nil "はてぶ" j 0) ("はてなブックマーク" nil "はてぶ" j 1) ("はてぶ" nil "hatebu" h 2) ("ハテブ" nil "hatebu" k 3) ("Ｈａｔｅｂｕ" nil "Hatebu" z 4) ("Hatebu" nil "Hatebu" l 5))
-       (sekkaHenkan userid kvs #f "Hatebu" 0 "normal"))
+       (sekkaHenkan userid kvs #f "Hatebu" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 11"
        '(("かに" nil "kani" h 0) ("カニ" nil "kani" k 1) ("ｋａｎｉ" nil "kani" z 2) ("kani" nil "kani" l 3) ("蟹" nil "かに" j 4) ("可児" nil "かに" j 5) ("蠏" nil "かに" j 6) ("簡易" nil "かんい" j 7) ("官位" nil "かんい" j 8) ("冠位" "-十二階" "かんい" j 9) ("漢医" "漢方医" "かんい" j 10) ("敢為" nil "かんい" j 11) ("官医" nil "かんい" j 12) ("寛衣" nil "かんい" j 13) ("換位" nil "かんい" j 14) ("簡意" nil "かんい" j 15))
-       (sekkaHenkan userid kvs #f "kani" 0 "normal"))
+       (sekkaHenkan userid kvs #f "kani" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 12"
        '(("かんい" nil "kanni" h 0) ("カンイ" nil "kanni" k 1) ("ｋａｎｎｉ" nil "kanni" z 2) ("kanni" nil "kanni" l 3) ("簡易" nil "かんい" j 4) ("官位" nil "かんい" j 5) ("冠位" "-十二階" "かんい" j 6) ("漢医" "漢方医" "かんい" j 7) ("敢為" nil "かんい" j 8) ("官医" nil "かんい" j 9) ("寛衣" nil "かんい" j 10) ("換位" nil "かんい" j 11) ("簡意" nil "かんい" j 12) ("蟹" nil "かに" j 13) ("可児" nil "かに" j 14) ("蠏" nil "かに" j 15))
-       (sekkaHenkan userid kvs #f "kanni" 0 "normal"))
+       (sekkaHenkan userid kvs #f "kanni" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 13"
        '(("確固" nil "かっこ" j 0) ("括弧" nil "かっこ" j 1) ("かっこ" nil "ka@ko" h 2) ("カッコ" nil "ka@ko" k 3) ("Ｋａ＠ｋｏ" nil "Ka@ko" z 4) ("Ka@ko" nil "Ka@ko" l 5))
-       (sekkaHenkan userid kvs #f "Ka@ko" 2 "normal"))
+       (sekkaHenkan userid kvs #f "Ka@ko" 2 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 14"
        '(("かっこ" nil "ka@ko" h 0) ("カッコ" nil "ka@ko" k 1) ("ｋａ＠ｋｏ" nil "ka@ko" z 2) ("ka@ko" nil "ka@ko" l 3) ("確固" nil "かっこ" j 4) ("括弧" nil "かっこ" j 5))
-       (sekkaHenkan userid kvs #f "ka@ko" 2 "normal"))
+       (sekkaHenkan userid kvs #f "ka@ko" 2 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 15"
        '(("確固" nil "かっこ" j 0) ("括弧" nil "かっこ" j 1) ("かっこ" nil "ka;ko" h 2) ("カッコ" nil "ka;ko" k 3) ("Ｋａ；ｋｏ" nil "Ka;ko" z 4) ("Ka;ko" nil "Ka;ko" l 5))
-       (sekkaHenkan userid kvs #f "Ka;ko" 2 "normal"))
+       (sekkaHenkan userid kvs #f "Ka;ko" 2 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 16"
        '(("かっこ" nil "ka;ko" h 0) ("カッコ" nil "ka;ko" k 1) ("ｋａ；ｋｏ" nil "ka;ko" z 2) ("ka;ko" nil "ka;ko" l 3) ("確固" nil "かっこ" j 4) ("括弧" nil "かっこ" j 5))
-       (sekkaHenkan userid kvs #f "ka;ko" 2 "normal"))
+       (sekkaHenkan userid kvs #f "ka;ko" 2 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 17"
        '(("ユーザー辞書" nil "ゆーざーじしょ" j 0) ("ゆーざーじしょ" nil "yu-za-jisyo" h 1) ("ユーザージショ" nil "yu-za-jisyo" k 2) ("Ｙｕ－ｚａ－ｊｉｓｙｏ" nil "Yu-za-jisyo" z 3) ("Yu-za-jisyo" nil "Yu-za-jisyo" l 4))
-       (sekkaHenkan userid kvs #f "Yu-za-jisyo" 2 "normal"))
+       (sekkaHenkan userid kvs #f "Yu-za-jisyo" 2 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 18"
        '(("２月２８日" nil "#がつ#にち" n 0) ("2月28日" nil "#がつ#にち" n 1) ("二月二八日" nil "#がつ#にち" n 2) ("二月２８日" nil "#がつ#にち" n 3) ("２ｇａｔｕ２８ｎｉｃｈｉ" nil "2gatu28nichi" z 4) ("2gatu28nichi" nil "2gatu28nichi" l 5))
-       (sekkaHenkan userid kvs #f "2gatu28nichi" 0 "normal"))
+       (sekkaHenkan userid kvs #f "2gatu28nichi" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 19"
        '(("１００" nil "100" n 0) ("100" nil "100" n 1) ("一〇〇" nil "100" n 2) ("百" nil "100" n 3))
-       (sekkaHenkan userid kvs #f "100" 0 "normal"))
+       (sekkaHenkan userid kvs #f "100" 0 "normal" #t))
 
 (test* "henkan toplevel(for Elisp) 20"
        '(("１００００２０００３" nil "1000020003" n 0) ("1000020003" nil "1000020003" n 1) ("一〇〇〇〇二〇〇〇三" nil "1000020003" n 2) ("十億二万三" nil "1000020003" n 3))
-       (sekkaHenkan userid kvs #f "1000020003" 0 "normal"))
+       (sekkaHenkan userid kvs #f "1000020003" 0 "normal" #t))
 (test* "henkan toplevel(for Elisp) 21"
        '(("3チーム" nil "#ちーむ" n 0) ("３ｃｈｉ－ｍｕ" nil "3chi-mu" z 1) ("3chi-mu" nil "3chi-mu" l 2))
-       (sekkaHenkan userid kvs #f "3chi-mu" 0 "normal"))
+       (sekkaHenkan userid kvs #f "3chi-mu" 0 "normal" #t))
 
+(sekkaHenkan userid kvs #f "*" 0 "normal" #f)
+
+(test* "henkan toplevel(for JSON) 1"
+       '#(#("＊" #f "*" j 0) #("※" #f "*" j 1) #("×" #f "*" j 2) #("＊" #f "*" z 3) #("*" #f "*" l 4))
+       (sekkaHenkan userid kvs #f "*" 0 "normal" #f))
+
+(test* "henkan toplevel(for JSON) 2"
+       '#(#("しぜんげんごりか" #f "shizengengorika" h 0) #("シゼンゲンゴリカ" #f "shizengengorika" k 1) #("しぜにぇにょりか" #f "shizengengorika" h 2) #("シゼニェニョリカ" #f "shizengengorika" k 3) #("ｓｈｉｚｅｎｇｅｎｇｏｒｉｋａ" #f "shizengengorika" z 4) #("shizengengorika" #f "shizengengorika" l 5) #("自然言語理解" #f "しぜんげんごりかい" j 6) #("自然言語" #f "しぜんげんご" j 7) #("自然言語処理" #f "しぜんげんごしょり" j 8))
+       (sekkaHenkan userid kvs #f "shizengengorika" 0 "normal" #f))
 
 
 ;;-------------------------------------------------------------------
@@ -1243,7 +1252,7 @@
        '(("返還" nil "へんかん" j 0) ("変換" nil "へんかん" j 1) ("変化" nil "へんか" j 2) ("返歌" nil "へんか" j 3) ("へんかん" nil "henkan" h 4) ("ヘンカン" nil "henkan" k 5) ("へにんあん" nil "henkan" h 6) ("ヘニンアン" nil "henkan" k 7) ("Ｈｅｎｋａｎ" nil "Henkan" z 8) ("Henkan" nil "Henkan" l 9))
        (begin
          (sekkaKakutei userid kvs #f "へんかん" "返還")
-         (sekkaHenkan userid kvs #f "Henkan" 0 "normal")))
+         (sekkaHenkan userid kvs #f "Henkan" 0 "normal" #t)))
 
 (test* "DB check after henkan kakutei 1"
        "/返還/変換"
@@ -1253,7 +1262,7 @@
        '(("変換" nil "へんかん" j 0) ("返還" nil "へんかん" j 1) ("変化" nil "へんか" j 2) ("返歌" nil "へんか" j 3) ("へんかん" nil "henkan" h 4) ("ヘンカン" nil "henkan" k 5) ("へにんあん" nil "henkan" h 6) ("ヘニンアン" nil "henkan" k 7) ("Ｈｅｎｋａｎ" nil "Henkan" z 8) ("Henkan" nil "Henkan" l 9))
        (begin
          (sekkaKakutei userid kvs #f "へんかん" "変換")
-         (sekkaHenkan userid kvs #f "Henkan" 0 "normal")))
+         (sekkaHenkan userid kvs #f "Henkan" 0 "normal" #t)))
 
 (test* "DB check after henkan kakutei 2"
        "/変換/返還"
@@ -1263,13 +1272,13 @@
        '(("デベロッパ" nil "developer" j 0) ("デベロッパー" nil "developer" j 1) ("ディベロッパー" nil "developer" j 2) ("ｄｅｖｅｌｏｐｅｒ" nil "developer" z 3) ("developer" nil "developer" l 4))
        (begin
          (sekkaKakutei userid kvs #f "developer" "デベロッパ")
-         (sekkaHenkan userid kvs #f "developer" 0 "normal")))
+         (sekkaHenkan userid kvs #f "developer" 0 "normal" #t)))
 
 (test* "henkan kakutei(for Elisp) 4"
        '(("。" nil "." j 0) ("．" nil "." j 1) ("・" nil "." j 2) ("…" "..." "." j 3) ("．" nil "." z 4) ("." nil "." l 5))
        (begin
          (sekkaKakutei userid kvs #f "." "。")
-         (sekkaHenkan userid kvs #f "." 0 "normal")))
+         (sekkaHenkan userid kvs #f "." 0 "normal" #t)))
 
 (test* "henkan kakutei(for Elisp) 5"
        nil
@@ -1287,24 +1296,24 @@
        '(("はてなブックマーク" nil "はてぶ" j 0) ("はてブ" nil "はてぶ" j 1) ("はてぶ" nil "hatebu" h 2) ("ハテブ" nil "hatebu" k 3) ("Ｈａｔｅｂｕ" nil "Hatebu" z 4) ("Hatebu" nil "Hatebu" l 5))
        (begin
          (sekkaKakutei userid kvs #f "はてぶ" "はてなブックマーク")
-         (sekkaHenkan userid kvs #f "Hatebu" 0 "normal")))
+         (sekkaHenkan userid kvs #f "Hatebu" 0 "normal" #t)))
 
 
 (test* "henkan kakutei(for Elisp) 9"
        '(("．" nil "." j 0) ("・" nil "." j 1) ("。" nil "." j 2) ("…" "..." "." j 3) ("．" nil "." z 4) ("." nil "." l 5))
        (begin
-         (sekkaHenkan userid2 kvs #f "." 0 "normal")))                  ;; userid2
+         (sekkaHenkan userid2 kvs #f "." 0 "normal" #t)))              ;; userid2
 
 (test* "henkan kakutei(for Elisp) 10"
        '(("。" nil "." j 0) ("．" nil "." j 1) ("・" nil "." j 2) ("…" "..." "." j 3) ("．" nil "." z 4) ("." nil "." l 5))
        (begin
          (sekkaKakutei userid2 kvs #f "." "。")                        ;; userid2
-         (sekkaHenkan userid2 kvs #f "." 0 "normal")))                  ;; userid2
+         (sekkaHenkan userid2 kvs #f "." 0 "normal" #t)))              ;; userid2
 
 (test* "henkan kakutei(for Elisp) 11"
        '(("。" nil "." j 0) ("．" nil "." j 1) ("・" nil "." j 2) ("…" "..." "." j 3) ("．" nil "." z 4) ("." nil "." l 5))
        (begin
-         (sekkaHenkan userid2 kvs #f "." 0 "normal")))                  ;; userid2
+         (sekkaHenkan userid2 kvs #f "." 0 "normal" #t)))              ;; userid2
 
 (test* "henkan kakutei(for Elisp) 12"
        nil
@@ -1315,30 +1324,30 @@
        '(("観" "(字義:みわたす)" "みr" j 0) ("見" nil "みr" j 1) ("視" "(字義:じっとみる)" "みr" j 2) ("診" "(diagnose) 患者を診る" "みr" j 3) ("看" "(nurse) 病母を看る" "みr" j 4) ("觀" "「観」の旧字" "みr" j 5) ("ｍｉＲ" nil "miR" z 6) ("miR" nil "miR" l 7))
        (begin
          (sekkaKakutei userid kvs #f "みr" "観")
-         (sekkaHenkan userid kvs #f "miR" 0 "normal")))
+         (sekkaHenkan userid kvs #f "miR" 0 "normal" #t)))
 
 (test* "henkan kakutei(for Elisp) 14"
        '(("視" "(字義:じっとみる)" "みr" j 0) ("観" "(字義:みわたす)" "みr" j 1) ("見" nil "みr" j 2) ("診" "(diagnose) 患者を診る" "みr" j 3) ("看" "(nurse) 病母を看る" "みr" j 4) ("觀" "「観」の旧字" "みr" j 5) ("ｍｉＲ" nil "miR" z 6) ("miR" nil "miR" l 7))
        (begin
          (sekkaKakutei userid kvs #f "みr" "視")
-         (sekkaHenkan userid kvs #f "miR" 0 "normal")))
+         (sekkaHenkan userid kvs #f "miR" 0 "normal" #t)))
 
 (test* "henkan kakutei(for Elisp) 15"
        '(("観る" "(字義:みわたす)" "みr" j 0) ("見る" nil "みr" j 1) ("視る" "(字義:じっとみる)" "みr" j 2) ("診る" "(diagnose) 患者を診る" "みr" j 3) ("看る" "(nurse) 病母を看る" "みr" j 4) ("觀る" "「観」の旧字" "みr" j 5) ("みる" nil "miru" h 6) ("ミル" nil "miru" k 7) ("ｍｉＲｕ" nil "miRu" z 8) ("miRu" nil "miRu" l 9))
        (begin
          (sekkaKakutei userid2 kvs #f "みr" "観る")                    ;; userid2
-         (sekkaHenkan userid2 kvs #f "miRu" 0 "normal")))               ;; userid2
+         (sekkaHenkan userid2 kvs #f "miRu" 0 "normal" #t)))           ;; userid2
 
 (test* "henkan kakutei(for Elisp) 16"
        '(("かに" nil "kani" h 0) ("カニ" nil "kani" k 1) ("ｋａｎｉ" nil "kani" z 2) ("kani" nil "kani" l 3) ("可児" nil "かに" j 4) ("蟹" nil "かに" j 5) ("蠏" nil "かに" j 6) ("簡易" nil "かんい" j 7) ("官位" nil "かんい" j 8) ("冠位" "-十二階" "かんい" j 9) ("漢医" "漢方医" "かんい" j 10) ("敢為" nil "かんい" j 11) ("官医" nil "かんい" j 12) ("寛衣" nil "かんい" j 13) ("換位" nil "かんい" j 14) ("簡意" nil "かんい" j 15))
        (begin
          (sekkaKakutei userid kvs #f "かに" "可児")
-         (sekkaHenkan userid kvs #f "kani" 0 "normal")))
+         (sekkaHenkan userid kvs #f "kani" 0 "normal" #t)))
 (test* "henkan kakutei(for Elisp) 17"
        '(("かんい" nil "kanni" h 0) ("カンイ" nil "kanni" k 1) ("ｋａｎｎｉ" nil "kanni" z 2) ("kanni" nil "kanni" l 3) ("官位" nil "かんい" j 4) ("簡易" nil "かんい" j 5) ("冠位" "-十二階" "かんい" j 6) ("漢医" "漢方医" "かんい" j 7) ("敢為" nil "かんい" j 8) ("官医" nil "かんい" j 9) ("寛衣" nil "かんい" j 10) ("換位" nil "かんい" j 11) ("簡意" nil "かんい" j 12) ("可児" nil "かに" j 13) ("蟹" nil "かに" j 14) ("蠏" nil "かに" j 15))
        (begin
          (sekkaKakutei userid kvs #f "かんい" "官位")
-         (sekkaHenkan userid kvs #f "kanni" 0 "normal")))
+         (sekkaHenkan userid kvs #f "kanni" 0 "normal" #t)))
 
 ;;===================================================================
 

data/test/jisyo.nnd

@@ -109,5 +109,11 @@
          '("shiroI Cしろi" "siroI Cしろi" "xiroI Cしろi" "しろi /白" "ai Cあい" "あい /愛/哀/相/挨" "Greek /Α/Β/Γ/Δ/Ε/Ζ/Η/Θ/Ι/Κ/Λ/Μ/Ν/Ξ/Ο/Π/Ρ/Σ/Τ/Υ/Φ/Χ/Ψ/Ω" ">an C>あん" ">ann C>あん" ">aq C>あん" ">あん /案" ">yasuI C>やすi" ">やすi /易" "! /！/感嘆符" "? /？" "ko'hi' Cこーひー" "ko'hi- Cこーひー" "ko'hi: Cこーひー" "ko'hi^ Cこーひー" "ko-hi' Cこーひー" "ko-hi- Cこーひー" "ko-hi: Cこーひー" "ko-hi^ Cこーひー" "ko:hi' Cこーひー" "ko:hi- Cこーひー" "ko:hi: Cこーひー" "ko:hi^ Cこーひー" "ko^hi' Cこーひー" "ko^hi- Cこーひー" "ko^hi: Cこーひー" "ko^hi^ Cこーひー" "こーひー /コーヒー" "=shimashita しました" "=shimasita しました" "=shimast しました" "=simashita しました" "=simasita しました" "=simast しました" "=ximast しました" "=shiteimasu しています" "=shitwms しています" "=siteimasu しています" "=sitwms しています" "=xitwms しています")
          (convert-skk-jisyo-f _input)))
 
+;;(with-open "./data/1000.tsv"
+;;           (lambda (_input)
+;;             (test* "restore"
+;;                    '("")
+;;                    (restore-sekka-jisyo-f _input "out.ldb"))))
+
 ;;===================================================================
 (test-end)

data/test/memcache.nnd

@@ -47,12 +47,6 @@
 ;;-------------------------------------------------------------------
 (test-section "memcached access")
 
-(test* "db connect NG and Exception"
-       (test-error MemCache::MemCacheError)
-       (let1 sv (Kvs.new dbtype)
-         (sv.open "localhost:11111")
-         (sv.put! "temp:1" "one")))
-
 (test* "db connect OK"
        "one"
        (begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sekka is a SKK like input method.