@@ -58,6 +58,9 @@ module FriendFeed attr_accessor :http_proxy attr_accessor :httpclient_max_keepalive + attr_accessor :name + attr_accessor :remote_key + class LShiftLogger def initialize(logger) @logger = logger @@ -124,6 +127,8 @@ module FriendFeed @http_proxy = nil @httpclient_max_keepalive = 5 * 60 @clients = {} + @name = nil + @remote_key = nil @mutex = Monitor.new end @@ -208,6 +213,19 @@ module FriendFeed obj['entries'] end end + + SEARCH_KEY = ['from', 'room', 'friends', 'service', 'intitle', 'incomment', 'comment', 'comments', 'like', 'likes'] + def search_opt_filter(query, opt) + ary = [] + opt.each do |k, v| + if SEARCH_KEY.include?(k.to_s) + opt.delete(k) + ary << k.to_s + ':' + v.to_s if v + end + end + ary.unshift(query) if query and !query.empty? + ary.join(' ') + end end class ChannelClient < BaseClient @@ -410,7 +428,8 @@ module FriendFeed def search_entries(name, remote_key, query, opt = {}) uri = uri("feed/search") - get_feed(uri, name, remote_key, :q => search_opt_convert(query, opt)) + opt[:q] = search_opt_filter(query, opt) + get_feed(uri, name, remote_key, opt) end def post(name, remote_key, title, link = nil, comment = nil, images = nil, files = nil, room = nil) @@ -522,15 +541,6 @@ module FriendFeed def url_base URL_BASE end - - SEARCH_KEY = ['from', 'room', 'friends', 'service', 'intitle', 'incomment', 'comment', 'comments', 'like', 'likes'] - def search_opt_convert(query, opt) - ary = opt.map { |k, v| - (SEARCH_KEY.include?(k.to_s) and v) ? k.to_s + ':' + v.to_s : nil - }.compact - ary.unshift(query) if query and !query.empty? - ary.join(' ') - end end end lib/ff.rb 4cb1b7ff290bb01b35bc788a55b67fe2f741030f NAKAMURA nakahiro@gmail.com http://github.com/nahi/f2p/commit/f14db90e19a20d0c9b69eb22f0067d01b7227fd3 f14db90e19a20d0c9b69eb22f0067d01b7227fd3 2009-07-16T08:21:17-07:00 2009-07-16T08:21:17-07:00 'entries in page' for search was ignored. closes #204. 3f33d97aae37bc202fc278157c3e637a0a14d2c9 NAKAMURA nakahiro@gmail.com