Changeset 2526 for lang/ruby/ssb

Timestamp:

12/06/07 03:35:55 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: improved emoji filter perfomance at UTF-8 page,

supports Shift_JIS URL parameter(Now you can use search web sites like Google Mobile!),
show filter proccess / total time.

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb.rb (modified) (4 diffs)
• libs/ssb/emoji.rb (modified) (2 diffs)
• libs/ssb/request.rb (modified) (2 diffs)
• templates/ssb.rhtml (modified) (1 diff)

lang/ruby/ssb/trunk/libs/ssb.rb

@@ -93 +93 @@
 
     def run(cgi_request, cgi_response)
+      @time_stamp.stamp(:request_start)
+
       # リクエストの生成
       @ssb_uri = 'http://' + cgi_request.host + File.basename(cgi_request.script_name) + '/'
@@ -99 +101 @@
       # ログ
       log(@request.method, @request.uri, @request.term.get_useragent(true), @request.term[:uid])
-      @time_stamp.stamp(:request_start)
 
       # リクエスト
@@ -118 +119 @@
       end
 
-      # 変換処理終了
-      @time_stamp.stamp(:proc_finish)
-
       output_template(@request.uri,
                       response,
@@ -150 +148 @@
       # qrcode
       qrcode = SSB::Qrcode.make_qrcode(request_uri.to_s)
+
+      # 変換処理終了
+      @time_stamp.stamp(:proc_finish)
 
       begin

lang/ruby/ssb/trunk/libs/ssb/emoji.rb

@@ -15 +15 @@
     RE_IMODE_SJIS = Regexp.new("((#{SJIS_IMODE_PICTOGRAM})|(#{SJIS_ONE_BYTE}|#{SJIS_TWO_BYTES}))")
 
+    @@ez_uni2_table = nil
+    @@docomo_uni2_table = nil
+
     # TODO: speed up!
     def self.ez_uni2number(uni)
-      table = YAML.load_file(File.join(SSB::CONFIG[:dat_dir], 'kddi-table.yaml'))
-      table.each {|x|
+      if @@ez_uni2_table.nil?
+        @@ez_uni2_table = YAML.load_file(File.join(SSB::CONFIG[:dat_dir], 'kddi-table.yaml'))
+      end
+      @@ez_uni2_table.each {|x|
         if x['unicode'] == uni
           return x['number']
@@ -27 +32 @@
 
     def self.docomo_uni2sjis(uni)
-      table = YAML.load_file(File.join(SSB::CONFIG[:dat_dir], 'docomo-table.yaml'))
-      table.each {|x|
+      if @@docomo_uni2_table.nil?
+        @@docomo_uni2_table = YAML.load_file(File.join(SSB::CONFIG[:dat_dir], 'docomo-table.yaml'))
+      end
+      @@docomo_uni2_table.each {|x|
         if x['unicode'] == uni
           return x['sjis']

lang/ruby/ssb/trunk/libs/ssb/request.rb

@@ -8 +8 @@
 require 'cgi'
 require 'net/http'
+require 'nkf'
 require 'ssb/misc'
 Net::HTTP::version_1_2
@@ -85 +86 @@
           uri_base = value.dup.untaint
         else                    # passing parameters
-          uri_params[key.dup.untaint] = CGI.escape(value.dup.untaint)
+          uri_params[NKF::nkf('-s', key)] = CGI.escape(NKF::nkf('-s', value))
         end
       end

lang/ruby/ssb/trunk/templates/ssb.rhtml

@@ -61 +61 @@
   end %>
               <td class="<%= time_class %>"><%= SSB::Misc.numeric(request_time) %></td>
+              <td class="time_unit">ms</td>
+            </tr>
+            <tr>
+              <td class="time_label">変換処理時間</td>
+              <td class="time"><%= SSB::Misc.numeric(proc_time) %></td>
+              <td class="time_unit">ms</td>
+            </tr>
+            <tr>
+              <td class="time_label">合計</td>
+              <td class="time"><%= SSB::Misc.numeric(total_time) %></td>
               <td class="time_unit">ms</td>
             </tr>