X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/597c27db39d8b36e623a9d6573e75edf657142c0..323c280a38e4154740639162969b427545678005:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 98a71e5..1df2856 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,4 +1,4 @@
-<%require 'IPAddr' %>
+<%require 'whois/whois' %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>
@@ -145,7 +145,6 @@ by several other names.</p>
 <div class="clearbox"></div>
 
 <h2>Voters</h2>
-
 <table class="voterbox">
 <tr>
 <th>IP Address</th>
@@ -157,10 +156,11 @@ by several other names.</p>
   <tr>
   <td><%= voter.ipaddress %></td>
   <td><% begin %>
-      <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
+      <% raise ArgumentError.new if voter.ipaddress == "127.0.0.1" %>
+      <%= Whois::Whois.new(IPAddr.new(voter.ipaddress).to_s).search_whois.grep(/^OrgName/)[0].sub(/^OrgName\:/,'').strip %>
     
     <% rescue ArgumentError => err %>
-      <%= " - " %>
+      <%= voter.ipaddress %>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>
@@ -168,8 +168,9 @@ by several other names.</p>
 <% end %>
 </table>
 
+<%= render :partial => 'pref_table' %>
+
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%><br />
 <%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %>
-