From: John Dong Date: Fri, 31 Aug 2007 14:44:13 +0000 (-0400) Subject: Merge jdong X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/7f5300ee1b7788329d4bf369ea3f9a756f41647c?hp=042f7939a264f7cdaa54df072ccd2c57e9587c4f Merge jdong --- diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml index 795ab45..1672499 100644 --- a/app/views/quickvote/list_voters.rhtml +++ b/app/views/quickvote/list_voters.rhtml @@ -26,11 +26,21 @@ /^192\.168/ or voter.ipaddress =~ /^10\./ or voter.ipaddress =~ /^169\.254/ or voter.ipaddress =~ /^172\.[1-3]/ %> - <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%> + <% w=nil + if Cache and w=Cache.get("WHOIS:#{voter.ipaddress}") + elsif Cache + w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) + w.search_whois + Cache.set("WHOIS:#{voter.ipaddress}", w) + else + w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) + w.search_whois + end + + %> <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%> - <%w.search_whois%> <%=h (w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip -%> - <%= (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %> <% rescue ArgumentError => err %>