From: John Dong <jdong@mit.edu>
Date: Tue, 14 Aug 2007 20:54:00 +0000 (-0400)
Subject: Merge from my devel branch
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/3c50454cc2031d8996c099ef3a0ff510ffdc299c?hp=7ee8e40628f6d7b775f48d859dd005de5a5e9afa

Merge from my devel branch
---

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index e94eaaa..8c0f04f 100644
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -1,10 +1,12 @@
 class VoteResultStruct < ActionWebService::Struct
-  member :plurality_winners, :string
-  member :approval_winners, :string
-  member :condorcet_winners, :string
-  member :ssd_winners, :string
-  member :borda_winners, :string
-  member :errors, :string
+  member :plurality_winners, [:int]
+  member :approval_winners, [:int]
+  member :condorcet_winners, [:int]
+  member :ssd_winners, [:int]
+  member :borda_winners, [:int]
+  member :candidate_ids, [:int]
+  member :candidate_names, [:string]
+  member :errors, [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
   api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]
diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index acbf012..83a6cc5 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -49,7 +49,7 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def index
-    @election = ident_to_quickvote(params[:ident])
+    @election = QuickVote.ident_to_quickvote(params[:ident])
     
     # if the person has specified an election, we show them the voting
     # page. otherwise, we redirect back to main the page
@@ -87,7 +87,7 @@ class QuickvoteController < ApplicationController
 
   def confirm
     # we need the election to verify that we have the right voter
-    election = ident_to_quickvote(params[:ident])
+    election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election
     @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", 
@@ -142,21 +142,9 @@ class QuickvoteController < ApplicationController
   ###############################################################
 
   def results
-    @election = ident_to_quickvote(params[:ident])
+    @election = QuickVote.ident_to_quickvote(params[:ident])
     @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
-
-  private
-  def ident_to_quickvote(ident)
-    if ident.match(/^\d+$/)
-      quickvote = QuickVote.find(ident)
-    else
-      quickvote = QuickVote.find_all(["name = ?", ident])[0]
-    end
-
-    return quickvote
-  end
-
 end
diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 6259784..5f566c6 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -74,4 +74,15 @@ class QuickVote < Election
 
 
   end
+
+  ### Convert a shortname or id into a QuickVote
+  def self.ident_to_quickvote(ident)
+    if ident.match(/^\d+$/)
+      quickvote = QuickVote.find(ident)
+    else
+      quickvote = QuickVote.find_all(["name = ?", ident])[0]
+    end
+
+    return quickvote
+  end
 end
diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index d383dcd..c0adc8a 100644
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -7,15 +7,23 @@ class SelectricityService < ActionWebService::Base
   end
   def get_quickvote_results(shortname)
     #TODO: Validate shortname
-    session=ActionController::Integration::Session.new
-    debugger
-    controller=session.get "quickvote/#{shortname}/results"
+    qv=QuickVote.ident_to_quickvote(shortname)
     result=VoteResultStruct.new
-    result.plurality_winners=session.controller.plurality_result.winners.inspect
-    result.approval_winners=session.controller.approval_result.winners.inspect
-    result.condorcet_winners=session.controller.condorcet_result.winners.inspect
-    result.ssd_winners=session.controller.ssd_result.winners.inspect
-    result.borda_winners=session.controller.borda_result.winners.inspect
+    result.errors=[]
+    unless qv
+      result.errors << "No quickvote with name #{shortname} found!"
+      return result
+    end
+    qv.results
+    result.plurality_winners=qv.plurality_result.winners
+    result.approval_winners=qv.approval_result.winners
+    result.condorcet_winners=qv.condorcet_result.winners
+    result.ssd_winners=qv.ssd_result.winners
+    result.borda_winners=qv.borda_result.winners
+    candidates={}
+    qv.candidates.each {|c| candidates[c.id] = c.name}
+    result.candidate_ids=candidates.keys
+    result.candidate_names=candidates.values
     result
   end
 end