X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/042f7939a264f7cdaa54df072ccd2c57e9587c4f..2facf9c3cba1ddc270c84a713cafbe6eb7280efd:/app/views/quickvote/list_voters.rhtml?ds=sidebyside

diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml
index 795ab45..b0dc6dd 100644
--- a/app/views/quickvote/list_voters.rhtml
+++ b/app/views/quickvote/list_voters.rhtml
@@ -1,5 +1,5 @@
 <%= GMap.header %> 
-
+<%require('whois/whois') %>
 <div id="title-header">
     <span class="header">Quickvote</span>
       <span class="subheader">Voters</span>
@@ -26,12 +26,27 @@
             /^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)%>
-        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
+            <% w=nil
+            if defined? Cache and w=Cache.get("WHOIS:#{voter.ipaddress}")
+            elsif defined? 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.reverse.slice(0,30).reverse)%>
       </td>
       <td>
-        <%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 %>
+        <%org=(w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip+" - "+ (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %>
+        <% if org =~ /asdfasdf/ %>
+          <%= "No additional information" %>
+        <% else %>
+          <%= h(org) %>
+        <% end %>
 
     <% rescue ArgumentError => err %>
       <%=h err %>