Merge from jdong

diff --combined app/views/quickvote/results.rhtml
index 7ab73efc23926bfc73db059bb5421d4b30e31be0,6c1130f5e56b560ecd03989baf9b6b69406bce72..9727d81289e6690597f298f4d5a0d8bb4a545e5e
--- 1/app/views/quickvote/results.rhtml
--- 2/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@@ -27,16 -27,121 +27,16 @@@
  
  <h2>Winners</h2>
  
 -<div class="mainresultbox">
 -<h3>Schulze Method Results</h3>
 -<%= render :partial => 'result', :object => @election.ssd_result %>
 +<%= render :partial => 'result_' + @election.election_method,
 +           :object => @results[@election.election_method] %>
  
 -<div class="rbmoreinfo">
 -<h4>About the Schulze Method</h4>
  
 -<p>The <%= link_to "Schulze method",
 -"http://en.wikipedia.org/wiki/Schulze_method" %> is a preferential
 -voting system. It is based on the Condorcet method but includes a set of
 -methods for resolving "circular" defeats.</p>
 -
 -<p>The Schulze method is also known as Schwartz Sequential Dropping
 -(SSD), Cloneproof Schwartz Sequential Dropping (CSSD), Beatpath Method,
 -Beatpath Winner, Path Voting, and Path Winner.</p>
 -</div>
 -
 -</div>
 -
 -<div class="resultbox">
 -<h3>Plurality Results</h3>
 -<%= render :partial => 'result', :object => @election.plurality_result %>
 -
 -<div class="rbmoreinfo">
 -<h4>About Plurality Voting</h4>
 -
 -<p><%= link_to "Plurality voting",
 -"http://en.wikipedia.org/wiki/Plurality_electoral_system" %> selects the
 -winner who has received the most "number one" votes, regardless of
 -whether or not he or she has a majority of votes.</p>
 -
 -<p>Plurality voting is also variously referred to as, "first past the
 -post," "winner-take-all," "majoritarian" or "simple majority"
 -voting.</p>
 -
 -</div>
 -</div>
 -
 -<div class="resultbox">
 -<h3>Approval Result</h3>
 -<p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
 -<%= render :partial => 'result', :object => @election.approval_result %>
 -
 -<div class="rbmoreinfo">
 -<h4>About Approval Voting</h4>
 -
 -<p><%= link_to "Approval voting",
 -"http://en.wikipedia.org/wiki/Approval_voting" %> is a voting system in
 -which each voter can vote for as many or as few candidates as the voter
 -chooses.  Approval voting is a limited form of range voting, where the
 -range that voters are allowed to express is extremely constrained:
 -accept or not.</p>
 -
 -</div>
 -
 -</div>
 -
 -<div class="resultbox">
 -<h3>Simple Condorcet Results</h3>
 -<%= render :partial => 'result', :object => @election.condorcet_result %>
 -
 -<div class="rbmoreinfo">
 -<h4>About Simple Cordorcet Voting</h4>
 -
 -<p><%= link_to "Condorcet",
 -"http://en.wikipedia.org/wiki/Condorcet_method" %> allows voters to rank
 -candidates in order of preference.  If there is a choice whom voters
 -prefer to each other choice when compared to one at a time, that choice
 -will be the winner.</p>
 -
 -<p>There is a family of Condorcet methods. This method is referred to as
 -"Simple Condorcet" to distinguish it from the Schulze method which is
 -another Condorcet system.</p>
 -
 -</div>
 -</div>
 -
 -<div class="resultbox">
 -<h3>Borda Count Results</h3>
 -<%= render :partial => 'result', :object => @election.borda_result %>
 -
 -<div class="rbmoreinfo">
 -<h4>About Borda Count</h4>
 -
 -<p><%= link_to "Borda count",
 -"http://en.wikipedia.org/wiki/Borda_count" %> 
 -is an election method in which voters rank
 -candidates in order of preference. The Borda count determines the winner
 -of an election by giving each candidate a certain number of points
 -corresponding to the position in which he or she is ranked by each
 -voter. Once all votes have been counted the candidate with the most
 -points is the winner.</p>
 -</div>
 -</div>
 -
 -<div class="resultbox">
 -<h3>Instant Runoff (IRV) Results</h3>
 -
 -<div class="rbmoreinfo">
 -<h4>About Instant Runoff Voting</h4>
 -
 -<p><%= link_to "Instant runoff voting",
 -"http://en.wikipedia.org/wiki/Instant_Runoff_Voting" %> is an electoral
 -system in which voters rank candidates in order of preference. In an IRV
 -election, if no candidate receives an overall majority of first
 -preferences the candidates with fewest votes are eliminated one by one,
 -and their votes transferred according to their second and third
 -preferences (and so on), until one candidate achieves a majority.</p>
 -
 -<p>Instant-runoff voting (IRV) is also known as the Alternative Vote (AV) and
 -by several other names.</p>
 -
 -</div>
 +<h3> Other Voting Methods </h3>
 +<% for result_type in @election.other_methods %>
 +<%= render :partial => 'result_' + result_type, 
 +           :object => @results[result_type] %>
 +<% end %>
  
 -</div>
  
  <div class="clearbox"></div>
  
@@@ -53,7 -158,7 +53,7 @@@
      <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= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%>
          <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
        </td>
        <td>
@@@ -64,6 -169,10 +64,10 @@@
        <%=h err %>
      </td>
      <td><%=h err%>
+     <% rescue NoMethodError %>
+       DNS Unreachable
+     </td>
+     <td> DNS Unreachable
      <% end %>
      </td>
    <td><%= voter.vote.votestring %></td>
@@@ -71,10 -180,10 +75,10 @@@
  <% end %>
  </table>
  
 -<%= render :partial => 'victories_ties' %>
 -<%= render :partial => 'pref_table' %>
 +<%= render :partial => 'pref_tables' %>
  
  <%=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 ) ) %>
 +<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
 +<%= image_tag(graph_url( :action => 'plurality_pie', :id => @election ) )%>