sekka 0.9.2 → 0.9.3

data/emacs/sekka.el

@@ -41,6 +41,16 @@
   :type  'string
   :group 'sekka)
 
+(defcustom sekka-server-url-2 ""
+  "SekkaサーバーのURLを指定する。"
+  :type  'string
+  :group 'sekka)
+
+(defcustom sekka-server-url-3 ""
+  "SekkaサーバーのURLを指定する。"
+  :type  'string
+  :group 'sekka)
+
 (defcustom sekka-server-timeout 10
   "Sekkaサーバーと通信する時のタイムアウトを指定する。(秒数)"
   :type  'integer
@@ -124,11 +134,16 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 
 (defvar sekka-sticky-shift nil     "*Non-nil であれば、Sticky-Shiftを有効にする")
 (defvar sekka-mode nil             "漢字変換トグル変数")
-(defvar sekka-mode-line-string     " Sekka")
+(defun sekka-modeline-string ()
+  ;; 接続先sekka-serverのホスト名を表示する。
+  (format " Sekka[%s]" (if current-sekka-server-url
+			   (url-host
+			    (url-generic-parse-url current-sekka-server-url))
+			 "")))
 (defvar sekka-select-mode nil      "候補選択モード変数")
 (or (assq 'sekka-mode minor-mode-alist)
     (setq minor-mode-alist (cons
-			    '(sekka-mode        sekka-mode-line-string)
+			    '(sekka-mode (:eval (sekka-modeline-string)))
 			    minor-mode-alist)))
 
 
@@ -144,6 +159,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 			(cons 'sekka-select-mode  sekka-select-mode-map))
 		  minor-mode-map-alist)))
 
+
+
 ;;;
 ;;; hooks
 ;;;
@@ -172,6 +189,9 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	  (insert string)))))
 
 
+;;; 現在のsekka-serverの接続先
+(defvar current-sekka-server-url     nil)
+
 ;;; 候補選択モード用
 (defvar sekka-history-stack '())        ; 過去に変換した、場所と変換候補の状態を保存しておくスタック
 ;; データ構造は以下の通り。
@@ -253,6 +273,9 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 ;;
 (defun sekka-init ()
   (when (not sekka-init)
+    ;; 現在のsekka-serverの接続先
+    (defvar current-sekka-server-url  sekka-server-url) ;; 第一候補で初期化しておく。
+
     ;; ユーザー語彙のロード + サーバーへの登録
     (sekka-register-userdict-internal)
     
@@ -279,6 +302,31 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
      ("method" .  "normal")
      )))
 
+
+;;
+;; 接続先を次候補のsekka-serverに切りかえる
+;;
+(defun sekka-next-sekka-server ()
+  (defun sekka-next-sekka-server-message(str varname)
+    (message (format "If you have %s sekka-server, please set the `%s' variable." str varname))
+    (sit-for 5))
+
+  (cond
+   ((string-equal current-sekka-server-url
+		  sekka-server-url)
+    (if (< 0 (length sekka-server-url-2))
+	(setq current-sekka-server-url sekka-server-url-2)
+      (sekka-next-sekka-server-message "second" "sekka-server-url-2")))
+   ((string-equal current-sekka-server-url
+		  sekka-server-url-2)
+    (if (< 0 (length sekka-server-url-3))
+	(setq current-sekka-server-url sekka-server-url-3)
+      (sekka-next-sekka-server-message "third"  "sekka-server-url-3")))
+   (t
+    (when (< 0 (length sekka-server-url))
+      (setq current-sekka-server-url sekka-server-url)))))
+
+
 ;;
 ;; ローマ字で書かれた文章をSekkaサーバーを使って変換する
 ;;
@@ -290,6 +338,30 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 ;;     ("method" .  "normal")
 ;;    )
 (defun sekka-rest-request (func-name arg-alist)
+  (defun one-request (func-name arg-alist)
+    (let ((result (sekka-rest-request-sub func-name arg-alist)))
+      (if (or
+	   (string-match-p "^curl: [(]6[)] " result) ;; Couldn't resolve host 'aaa.example.com' 
+	   (string-match-p "^curl: [(]7[)] " result) ;; Couldn't connect to host 'localhost'
+	   )
+	  (progn
+	    (sekka-next-sekka-server)
+	    nil)
+	result)))
+
+  (or
+   (one-request func-name arg-alist)
+   (one-request func-name arg-alist)
+   (one-request func-name arg-alist)
+   (concat
+    "Error: All sekka-server are down. "
+    " " sekka-server-url
+    " " sekka-server-url-2
+    " " sekka-server-url-3)))
+
+	
+
+(defun sekka-rest-request-sub (func-name arg-alist)
   (if sekka-psudo-server
       (cond
        ((string-equal func-name "henkan")
@@ -314,7 +386,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	    (format " --max-time %d " sekka-server-timeout)
 	    " --insecure "
 	    " --header 'Content-Type: application/x-www-form-urlencoded' "
-	    (format "%s%s " sekka-server-url func-name)
+	    (format "%s%s " current-sekka-server-url func-name)
 	    (sekka-construct-curl-argstr (cons
 					  '("format" . "sexp")
 					  arg-alist))
@@ -1552,7 +1624,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "0.9.2" ;;SEKKA-VERSION
+  "0.9.3" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/jisyo-db.nnd

@@ -242,10 +242,10 @@
       (let ([d (. (Date.new 0) to_s)])
         (if (and (kvs.pure_put! "key_for_ping" d)
                  (string=? (kvs.get  "key_for_ping") d))
-            (STDERR.puts "Info: database file was clean")
+            (STDERR.puts "Info: database file is clean")
             ;; 正常に読み書きできないようであれば、データベースを修復する
             (begin
-              (STDERR.puts "Info: database file was NOT clean. try to fix...")
+              (STDERR.puts "Info: database file is NOT clean. try to fix...")
               (kvs.fixdb)
               (STDERR.puts "Info: done."))))
       (to-arr (list kvs cachesv)))))

data/lib/sekka/sekkaversion.rb

@@ -1,5 +1,5 @@
 class SekkaVersion
   def self.version
-    "0.9.2"
+    "0.9.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sekka
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sekka is a SKK like input method.