Changeset 33148

Timestamp:

05/07/09 22:59:19 (4 years ago)

Author:

sho

Message:

supported prev/next page.

Files:

• platform/tdiary/plugin/search-yahoo.rb (modified) (4 diffs)

platform/tdiary/plugin/search-yahoo.rb

@@ -3 +3 @@
 # search-yahoo.rb - site search plugin sample using Yahoo! Search BOSS API.
 #
-# Copyright (C) 2009, TADA Tadashi <sho@spc.gr.jp>
+# Copyright (C) 2009, TADA Tadashi <t@tdtds.jp>
 # You can redistribute it and/or modify it under GPL.
 #
@@ -34 +34 @@
         appid = @conf['search-yahoo.appid']
 
-        url << "#{q}?appid=#{appid}&count=50&start=#{start}"
+        url << "#{q}?appid=#{appid}&count=20&start=#{start}"
 
         proxy = @conf['proxy']
         proxy = 'http://' + proxy if proxy
-        timeout( 10 ) do
+        timeout( 20 ) do
                 open( url, :proxy => proxy ) {|f| f.read }
         end
@@ -68 +68 @@
         r = search_input_form( query )
         r << '<dl class="search-result">'
-        res['resultset_web'].each do |elem|
+        (res['resultset_web']||[]).each do |elem|
                 url = elem['url']
                 next unless url =~ @conf['search-yahoo.result_filter']
@@ -78 +78 @@
         r << '</dl>'
 
-### PENDING ###
-#       r << '<div class="search-navi">'
-#       doc.elements.to_a( '/ysearchresponse/prevpage' ).each do |p|
-#               if /start=\d+/ =~ p.text then
-#                       r << %Q|<a href="#{@conf.index}?q=#{u query}&#$&">&lt;前の50件</a>&nbsp;|
-#               end
-#       end
-#
-#       doc.elements.to_a( '/ysearchresponse/nextpage' ).each do |n|
-#               if /start=\d+/ =~ n.text then
-#                       r << %Q|<a href="#{@conf.index}?q=#{u query}&#$&">次の50件&gt;</a>|
-#               end
-#       end
-#       r << '</div>'
+        r << '<div class="search-navi">'
+        (res['prevpage']||[]).each do |p|
+                if /start=\d+/ =~ p then
+                        r << %Q|<a href="#{@conf.index}?q=#{u query}&#$&">&lt;前の20件</a>&nbsp;|
+                end
+        end
+
+        (res['nextpage']||[]).each do |n|
+                if /start=\d+/ =~ n then
+                        r << %Q|<a href="#{@conf.index}?q=#{u query}&#$&">次の20件&gt;</a>|
+                end
+        end
+        r << '</div>'
 
         r