-<% %>
+<%require 'IPAddr' %>
<h1>Results</h1>
<% if @election.shortdesc %>
<div class="clearbox"></div>
<h2>Voters</h2>
-
<table class="voterbox">
<tr>
<th>IP Address</th>
<% next unless voter.voted? %>
<tr>
<td><%= voter.ipaddress %></td>
- <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
+ <td><% begin %>
+ <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
+
+ <% rescue ArgumentError => err %>
+ <%= voter.ipaddress %>
+ <% end %>
+ </td>
<td><%= voter.vote.votestring %></td>
</tr>
<% 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 ) ) %>
-