X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/ffec26b00fc14b92f82137e1e3c62ce78c93ea24..575b480d55931d0ad4d4ed435b6166fbcfe23104:/app/models/selectricity_service.rb

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index 544b618..a3de89f 100644
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -45,7 +45,7 @@ class SelectricityService < ActionWebService::Base
   def get_quickvote_results(shortname)
     #TODO: Validate shortname
     qv=QuickVote.ident_to_quickvote(shortname)
-    result=VoteResultStruct.new
+    result=QuickVoteResultStruct.new
     unless qv
       raise ArgumentError.new("No quickvote with name #{shortname} found!")
     end
@@ -59,7 +59,7 @@ class SelectricityService < ActionWebService::Base
   end
   def get_quickvote_candidate_map(shortname)
     qv=QuickVote.ident_to_quickvote(shortname)
-    result=CandidateMap.new
+    result=QuickVoteCandidateMap.new
     unless qv
       raise ArgumentError.new("No quickvote with name #{shortname} found!")
     end
@@ -78,7 +78,7 @@ class SelectricityService < ActionWebService::Base
     end
 
     qv.votes.collect do |vote|
-       VoteInfo.new(:voter_id => vote.voter.id,
+       QuickVoterInfo.new(:voter_id => vote.voter.id,
                     :voter_ipaddress => vote.voter.ipaddress,
                     :vote_time => vote.time.to_i,
                     :vote => vote.votes,
@@ -97,7 +97,7 @@ class SelectricityService < ActionWebService::Base
       raise ArgumentError.new("Cannot find QuickVote named #{shortname}")
     end
 
-    ElectionStruct.new(
+    QuickVoteStruct.new(
       :id => election.id,
       :name => election.name,
       :description => election.description,