diff options
author | Yorhel <git@yorhel.nl> | 2010-02-05 12:25:11 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2010-02-05 12:25:11 +0100 |
commit | 7cbc9315a6e4315a62da080381f300e3b5d80f56 (patch) | |
tree | dfbcfa6714ac23bd8cb6271948a3017b7059c645 /util | |
parent | b541d72849cd859580e7e6d7232165c92aa3a40b (diff) | |
parent | 3f69720f88396543c34a682093f147afbef75c65 (diff) |
Merge branch 'master' into beta
Conflicts:
data/lang.txt
Diffstat (limited to 'util')
-rw-r--r-- | util/sql/func.sql | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/sql/func.sql b/util/sql/func.sql index a58bce9e..f9f0e490 100644 --- a/util/sql/func.sql +++ b/util/sql/func.sql @@ -96,10 +96,10 @@ BEGIN ) -- grouped by (tag, vid) SELECT tag, vid, COUNT(uid) AS users, AVG(vote)::real AS rating, - (CASE WHEN AVG(spoiler) < 0.7 THEN 0 WHEN AVG(spoiler) > 1.3 THEN 2 ELSE 1 END)::smallint AS spoiler + (CASE WHEN AVG(spoiler) > 1.3 THEN 2 WHEN AVG(spoiler) > 0.7 THEN 1 ELSE 0 END)::smallint AS spoiler FROM ( -- grouped by (tag, vid, uid), so only one user votes on one parent tag per VN entry (also removing meta tags) - SELECT tag, vid, uid, MAX(vote)::real, COALESCE(AVG(spoiler), 0)::real + SELECT tag, vid, uid, MAX(vote)::real, AVG(spoiler)::real FROM tags_vn_all WHERE NOT meta GROUP BY tag, vid, uid |