sekka 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a108787776bb4c040bef99de3012afb6d93f9d78
-  data.tar.gz: 97bf95254efdc53092f53da5abd9df9cd41a1367
+  metadata.gz: 2887ee7935af58c6a120baa0a4c5c2a0cbb45f36
+  data.tar.gz: f176b203351a4a5e239680aad03b7da0bd8e1472
 SHA512:
-  metadata.gz: a322326b0b334e5aed6dc6ff67970b0c27ae86bc8209418f8d1d2b3d240885a9f4cde7f854dab19723c02b0ba0d8e1018f74a221c1de955649d576c25f5af0d5
-  data.tar.gz: d280fef49d24019299d72cc11f4e41fc3dc822a9988f5a63e0da288668ae13853a7e8335005fceeb0ca923e2c96c908b13dc6921347c6ec8fef7904f40aae211
+  metadata.gz: 0952e5ff9710e90543043ded89983e06b0e2d8d5fc5a130a393fae20e381097c70667f5af9bfcd010fd4fe3a7700bd73579979345b6bf97fd6a73d049360bd12
+  data.tar.gz: 4c99ab92b87bd229364548ca39ae726d6658eedeaa74b8799a4598a32f37a4b6463d3733880f9e9fe0bfdceb63057206d2c50332bf2ca0f427a310760c34949c

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 6
-:patch: 1
+:patch: 2

data/data/SKK-JISYO.L.201501

@@ -85772,7 +85772,6 @@ zyklus /チクルス/ツィクルス/
 これ> /之/是/此れ;-幸い,-何如に/
 これい /古例/古礼/
 これいじょう /これ以上/
-これお /是雄/
 これかた /是方/
 これき /古暦/
 これさだ /是定/
@@ -165827,7 +165826,6 @@ zyklus /チクルス/ツィクルス/
 ものうち /物打ち/物打/
 ものうらやみ /物羨み/
 ものうり /物売り/
-ものお /桃生/
 ものおき /物置/
 ものおしみ /物惜しみ/
 ものおじ /物怖じ/物怖/

data/data/SKK-JISYO.hiragana-phrase

@@ -19644,7 +19644,6 @@
 げるなどして //
 こしたことある //
 こしたりする //
-ことお //
 これまでより //
 ごつい //
 させたりして //
@@ -24206,7 +24205,6 @@
 くらしのなか //
 けていたので //
 けんこう //
-これお //
 ころしあむ //
 させようして //
 させられたため //

data/data/SKK-JISYO.hiragana-phrase3

@@ -78,8 +78,6 @@ sur /する/
 という //
 しかし //
 ための /ための/
-ことを /ことを/
-これを /これを/
 からの /からの/
 なったので //
 だけなので //

data/emacs/sekka.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
 ;; Author: Kiyoka Nishiyama <kiyoka@sumibi.org>
-;; Version: 1.6.1          ;;SEKKA-VERSION
+;; Version: 1.6.2          ;;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.1" ;;SEKKA-VERSION
+  "1.6.2" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/henkan.nnd

@@ -2,7 +2,7 @@
 ;;;
 ;;; henkan.nnd - 変換エンジンのコア
 ;;;  
-;;;   Copyright (c) 2010  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+;;;   Copyright (c) 2015  Kiyoka Nishiyama  <kiyoka@sumibi.org>
 ;;;   
 ;;;   Redistribution and use in source and binary forms, with or without
 ;;;   modification, are permitted provided that the following conditions
@@ -387,7 +387,7 @@
 
 ;; conversion #f => nil for EmacsLisp
 (define (sekkaHenkan userid kvs cachesv keyword limit roman-method)
-  (define cache-exp-second (* 60 60))
+  (define cache-exp-second (* 10 60))
   (let* ((keyword (keyword.strip))
          (sekka-keyword (+ "sekka:" roman-method ":" (limit.to_s) ":" keyword)))
     (if-let1 fetched (and cachesv

data/lib/sekka/sekkaversion.rb

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

data/lib/sekkaserver.rb

@@ -3,7 +3,7 @@
 #
 # sekkaserver.rb  -  "a sekka server"
 #
-#   Copyright (c) 2010  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#   Copyright (c) 2015  Kiyoka Nishiyama  <kiyoka@sumibi.org>
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -60,10 +60,12 @@ module SekkaServer
       @core.evalStr( "(use sekka.henkan)" )
       @core.evalStr( '(define (writeToString sexp) (write-to-string sexp))' )
       @core.evalStr( '(export-to-ruby writeToString)' )
-      (@kvs,@cachesv) = @core.openSekkaJisyo( SekkaServer::Config.dictType,
-                                              SekkaServer::Config.dictSource,
-                                              SekkaServer::Config.cacheSource )
-
+      (@kvs,@initialCachesv) = @core.openSekkaJisyo( SekkaServer::Config.dictType,
+                                                      SekkaServer::Config.dictSource,
+                                                      SekkaServer::Config.cacheSource )
+      @cachesv = @initialCachesv
+      @downTime = DateTime.now
+      
       version = @kvs.get( "SEKKA:VERSION" )
       if not SekkaVersion.dictVersion == version
         STDERR.printf(   "Sekka Error: require dict version [%s] but got [%s].\n", SekkaVersion.dictVersion, version )
@@ -166,6 +168,8 @@ module SekkaServer
              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
@@ -183,12 +187,16 @@ module SekkaServer
                        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} (may be offline)"
+                       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} (may be offline)"
+                       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} (may be offline)"
+                       result = "sekka-server: ConnectionRefused to request memcached server #{_orRedis} (or may be offline)"
+                       disableMemcache()
                      end
                  }
                  when "/kakutei"
@@ -234,5 +242,22 @@ 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
+      end
+    end
+    
+    def disableMemcache()
+      @cachesv  = false
+      @downTime = DateTime.now
+      STDERR.printf( "Sekka Warning: disabled using memcache server. [%s]\n", @downTime )
+    end
   end
 end

data/public_dict/1.6.0/SEKKA-JISYO-1.6.0.N.md5

@@ -1 +1 @@
-64aa1cf5d25a3e01a5a4b3b81c5172cd  ./data/SEKKA-JISYO-1.6.0.N.tsv
+5c3b25121494df59d27397b588534e16  ./data/SEKKA-JISYO-1.6.0.N.tsv

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -149,7 +149,6 @@ files:
 - data/.gitignore
 - data/MY-JISYO.hira-kata
 - data/SEKKA-JISYO.S.201001
-- data/SKK-JISYO.L.201008
 - data/SKK-JISYO.L.201501
 - data/SKK-JISYO.L.hira-kata
 - data/SKK-JISYO.S.201001