X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/df81b74ceb3e11d9de2e523bf93c6c69d5da1dfb..8ae0d71896fa022dd80e5a5de993e1382564fcb1:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index a2b1206..24a9beb 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -158,10 +158,11 @@ by several other names.</p>
         <% raise ArgumentError.new, "Local Server" if voter.ipaddress == "127.0.0.1" %>
         <% raise ArgumentError.new, "XML-RPC Voter" if voter.ipaddress == "XMLRPC Request" %>
         <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress).to_s,true)%>
-        <%=(w.host == nil or w.host.empty?) ? "Unknown voter" : w.host%>
+        <%=(w.host == nil or w.host.empty?) ? voter.ipaddress : w.host%>
       </td>
-  <td>
-      <%= w.search_whois.grep(/^OrgName/)[0].sub(/^OrgName\:/,'').strip %>
+      <td>
+        <%w.search_whois%>
+        <%= (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 %>
       <%= err %>
@@ -174,6 +175,7 @@ by several other names.</p>
 <% end %>
 </table>
 
+<%= render :partial => 'defeats_list' %>
 <%= render :partial => 'pref_table' %>
 
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />