# HG changeset patch
# User jbe
# Date 1359833823 -3600
# Node ID 09e2805decd3097c06d5b81f8a1818965df3e3df
# Parent  727926e290e73055fcae3895d0dcb0fdf0648e9b
Count non-fulfilled suggestions with positive opinion and fulfilled suggestions with negative opinion for "harmonic_weight" of suggestions

diff -r 727926e290e7 -r 09e2805decd3 core.sql
--- a/core.sql	Sat Feb 02 20:21:16 2013 +0100
+++ b/core.sql	Sat Feb 02 20:37:03 2013 +0100
@@ -3184,7 +3184,10 @@
   JOIN "opinion"
     ON "direct_interest_snapshot"."member_id" = "opinion"."member_id"
     AND "initiative"."id" = "opinion"."initiative_id"
-    AND "opinion"."degree" > 0
+    AND (
+      ("opinion"."degree" > 0 AND "opinion"."fulfilled" = FALSE) OR
+      ("opinion"."degree" < 0 AND "opinion"."fulfilled" = TRUE)
+    )
   GROUP BY
     "initiative"."issue_id",
     "opinion"."initiative_id",
diff -r 727926e290e7 -r 09e2805decd3 update/core-update.v2.1.0-v2.1.1.sql
--- a/update/core-update.v2.1.0-v2.1.1.sql	Sat Feb 02 20:21:16 2013 +0100
+++ b/update/core-update.v2.1.0-v2.1.1.sql	Sat Feb 02 20:37:03 2013 +0100
@@ -137,7 +137,10 @@
   JOIN "opinion"
     ON "direct_interest_snapshot"."member_id" = "opinion"."member_id"
     AND "initiative"."id" = "opinion"."initiative_id"
-    AND "opinion"."degree" > 0
+    AND (
+      ("opinion"."degree" > 0 AND "opinion"."fulfilled" = FALSE) OR
+      ("opinion"."degree" < 0 AND "opinion"."fulfilled" = TRUE)
+    )
   GROUP BY
     "initiative"."issue_id",
     "opinion"."initiative_id",