From 72cece8d09ae0f2835eed996e15ddfe3cb95045f Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Thu, 11 Oct 2007 07:36:23 +0000 Subject: first_html_par: detect fragment at the right place --- lib/rbot/core/utils/utils.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/rbot/core/utils/utils.rb b/lib/rbot/core/utils/utils.rb index faf42b63..535ae190 100644 --- a/lib/rbot/core/utils/utils.rb +++ b/lib/rbot/core/utils/utils.rb @@ -505,9 +505,6 @@ module ::Irc when Net::HTTPResponse Utils.get_resp_html_info(doc, opts) when URI - if doc.fragment and not doc.fragment.empty? - opts[:uri_fragment] ||= doc.fragment - end ret = Hash.new @@bot.httputil.get_response(doc) { |resp| ret = Utils.get_resp_html_info(resp, opts) @@ -543,6 +540,10 @@ module ::Irc partial = resp.partial_body(@@bot.config['http.info_bytes']) if resp['content-type'] =~ /^text\/|(?:x|ht)ml/ + loc = URI.parse(resp['x-rbot-location'] || resp['location']) rescue nil + if loc and loc.fragment and not loc.fragment.empty? + opts[:uri_fragment] ||= loc.fragment + end ret.merge!(Utils.get_string_html_info(partial, opts)) end return ret -- cgit v1.2.3