Mercurial > hg > fapweb
changeset 557:2de6e0ecb3fa
Cleanup results SQL clause computation.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 21 Dec 2013 08:10:29 +0200 |
| parents | 62f47e89693e |
| children | 09a11dd385c7 |
| files | msite.inc.php |
| diffstat | 1 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/msite.inc.php Sat Dec 21 00:19:52 2013 +0200 +++ b/msite.inc.php Sat Dec 21 08:10:29 2013 +0200 @@ -430,9 +430,9 @@ { case VOTE_FREELY: $sql = - "SELECT entries.*,SUM(votes.value) AS votesum FROM entries ". - "LEFT JOIN votes ON votes.entry_id=entries.id ". - "WHERE entries.compo_id=".$compo_id; + "SELECT entries.*,SUM(votes.value) AS votesum ". + "FROM entries ". + "LEFT JOIN votes ON votes.entry_id=entries.id"; break; case VOTE_ACTIVATE: @@ -442,31 +442,23 @@ "LEFT JOIN votekeys ON votes.key_id=votekeys.id ". "WHERE votes.entry_id=entries.id AND votekeys.active<>0) ". "AS votesum ". - "FROM entries ". - "WHERE entries.compo_id=".$compo_id; + "FROM entries"; break; case VOTE_ASSIGN: $sql = - "SELECT entries.*,SUM(votes.value) AS votesum FROM entries ". - "LEFT JOIN votes ON votes.entry_id=entries.id ". - "LEFT JOIN attendees ON votes.key_id=attendees.key_id ". - "WHERE entries.compo_id=".$compo_id." ". - "AND attendees.key_id<>0"; - - $sql = "SELECT entries.*, ". "(SELECT SUM(votes.value) FROM votes ". "LEFT JOIN votekeys ON votes.key_id=votekeys.id ". "LEFT JOIN attendees ON votekeys.id=attendees.key_id ". "WHERE votes.entry_id=entries.id AND attendees.key_id<>0) ". "AS votesum ". - "FROM entries ". - "WHERE entries.compo_id=".$compo_id; + "FROM entries"; break; } $sql .= " ". + "WHERE entries.compo_id=".$compo_id. "GROUP BY entries.id ". "ORDER BY votesum DESC";