Merged from Mako.

[selectricity] / app / views / quickvote / results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index cba32d08f66761ffad948f64a949e0feb884505f..bc33d072f4379774a58335b0a26d67507bad47de 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,5 +1,5 @@
-<%  %>
-<%require 'IPAddr' %>
+<% %>
+<%require 'whois/whois' %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>
@@ -145,22 +145,30 @@ by several other names.</p>
 
 <div class="clearbox"></div>
 
-<h2>Voters</h2>
+<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
 <table class="voterbox">
 <tr>
-<th>IP Address</th>
-<th>DNS/Host</th>
+<th>IP/Host</th>
+<th>Origin</th>
 <th>Vote</th>
 </tr>
 <% for voter in @election.voters %>
   <% next unless voter.voted? %>
   <tr>
-  <td><%= voter.ipaddress %></td>
-  <td><% begin %>
-      <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
+    <td><% begin %>
+        <% 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?) ? voter.ipaddress : w.host%>
+      </td>
+      <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 %>
-      <%= voter.ipaddress %>
+      <%= err %>
+    </td>
+    <td><%= err%>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>
@@ -168,10 +176,10 @@ by several other names.</p>
 <% end %>
 </table>
 
-<%= render :partial => 'defeats_list' %>
+<%= render :partial => 'victories_ties' %>
 <%= 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 => '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 ) ) %>