[Prime-cvs] CVS update: prime/lib

アーカイブの一覧に戻る

Hiroyuki Komatsu komat****@users*****
2004年 12月 31日 (金) 05:15:25 JST


Index: prime/lib/taiyaki.rb
diff -u prime/lib/taiyaki.rb:1.6.4.4 prime/lib/taiyaki.rb:1.6.4.5
--- prime/lib/taiyaki.rb:1.6.4.4	Sun Dec  5 19:07:17 2004
+++ prime/lib/taiyaki.rb	Fri Dec 31 05:15:25 2004
@@ -1,5 +1,5 @@
 # taiyaki.rb: Ruby Libraries by Hiroyuki Komatsu
-# $Id: taiyaki.rb,v 1.6.4.4 2004/12/05 10:07:17 komatsu Exp $
+# $Id: taiyaki.rb,v 1.6.4.5 2004/12/30 20:15:25 komatsu Exp $
 #
 # Copyright (C) 2002 Hiroyuki Komatsu <komat****@taiya*****>
 #     All rights reserved.
@@ -56,6 +56,7 @@
           'prime/prime-dict-config.rb' =>
                              'http://sourceforge.jp/projects/prime/',
           'suikyo/suikyo' => 'http://taiyaki.org/suikyo/',
+          'MeCab'         => 'http://chasen.org/~taku/software/mecab/',
   }
   begin
     Kernel::require(name)
@@ -84,7 +85,7 @@
       end
       $stderr.puts("  Sorry for your inconvenience.")
     end
-    exit()
+    raise(LoadError)
   end
 end
 
Index: prime/lib/server.rb
diff -u prime/lib/server.rb:1.2.4.1 prime/lib/server.rb:1.2.4.2
--- prime/lib/server.rb:1.2.4.1	Mon Sep 27 20:07:51 2004
+++ prime/lib/server.rb	Fri Dec 31 05:15:25 2004
@@ -1,5 +1,5 @@
 # server.rb
-# $Id: server.rb,v 1.2.4.1 2004/09/27 11:07:51 komatsu Exp $
+# $Id: server.rb,v 1.2.4.2 2004/12/30 20:15:25 komatsu Exp $
 #
 # Copyright (C) 2001 Satoru Takabayashi <sator****@namaz*****>
 # Copyright (C) 2004 Hiroyuki Komatsu <komat****@taiya*****>
@@ -12,7 +12,6 @@
 
 require 'socket'
 require 'thread'
-require 'iconv'
 
 class Server
   def initialize (session)
@@ -55,6 +54,7 @@
   end
 
   def set_encoding (encoding)
+    require 'iconv'
     @iconv_out = Iconv.new(encoding, "EUC-JP")  # PRIME -> Client
     @iconv_in  = Iconv.new("EUC-JP", encoding)  # PRIME <- Client
   end
Index: prime/lib/prime.rb
diff -u prime/lib/prime.rb:1.7.4.14 prime/lib/prime.rb:1.7.4.15
--- prime/lib/prime.rb:1.7.4.14	Tue Dec 21 00:16:51 2004
+++ prime/lib/prime.rb	Fri Dec 31 05:15:25 2004
@@ -1,5 +1,5 @@
 # prime/prime.rb
-# $Id: prime.rb,v 1.7.4.14 2004/12/20 15:16:51 komatsu Exp $
+# $Id: prime.rb,v 1.7.4.15 2004/12/30 20:15:25 komatsu Exp $
 #
 # Copyright (C) 2002, 2003, 2004 Hiroyuki Komatsu <komat****@taiya*****>
 #     All rights reserved.
@@ -448,6 +448,7 @@
       ( "suffix=#{@rest}"                   unles****@rest*****?()           ),
       ( "annotation=#{@data['annotation']}" if****@data*****_key?('annotation') ),
       ( "usage=#{@data['usage']}"           if****@data*****_key?('usage')      ),
+      ( "comment=#{@data['comment']}"       if****@data*****_key?('comment')    ),
     ]
     return data_list.compact.join("\t")
   end
@@ -458,7 +459,7 @@
       to_text_literal(),
       ( "form=#{@data['annotation']}"  if****@data*****_key?('annotation') ),
       ( "usage=#{@data['usage']}"      if****@data*****_key?('usage')      ),
-      ( "comment=#{@data['usage']}"    if****@data*****_key?('comment')    ),
+      ( "comment=#{@data['comment']}"  if****@data*****_key?('comment')    ),
     ]
     return data_list.compact.join("\t")
   end


Prime-cvs メーリングリストの案内
アーカイブの一覧に戻る