# HG changeset patch
# User jbe
# Date 1307102609 -7200
# Node ID fb5dc1bf921fbcceec397c6edb993cb04ddd9c67
# Parent  043e6e235a53f28fd315a1626efbd146cec499b9
Ignore "policy"."no_multistage_majority", if "policy"."majority_indirect" is set

diff -r 043e6e235a53 -r fb5dc1bf921f core.sql
--- a/core.sql	Fri Jun 03 13:28:51 2011 +0200
+++ b/core.sql	Fri Jun 03 14:03:29 2011 +0200
@@ -337,7 +337,7 @@
 COMMENT ON COLUMN "policy"."majority_non_negative" IS 'Absolute number of sum of "positive_votes" and abstentions neccessary for an initiative to be "attainable".';
 COMMENT ON COLUMN "policy"."majority_indirect"     IS 'If TRUE, then the majority specified by "majority_num", "majority_den", "majority_strict", "majority_positive" and "majority_non_negative" might be indirect; if FALSE, then the status quo must be beaten directly with that majority';
 COMMENT ON COLUMN "policy"."no_reverse_beat_path"  IS 'Causes initiatives with "reverse_beat_path" flag to not be "eligible", thus disallowing them to be winner. See comment on column "initiative"."reverse_beat_path".';
-COMMENT ON COLUMN "policy"."no_multistage_majority" IS 'Causes initiatives with "multistage_majority" flag to not be "eligible", thus disallowing them to be winner. See comment on column "initiative"."multistage_majority".';
+COMMENT ON COLUMN "policy"."no_multistage_majority" IS 'Causes initiatives with "multistage_majority" flag to not be "eligible", thus disallowing them to be winner. See comment on column "initiative"."multistage_majority". This flag is ignored, if "policy"."majority_indirect" is set to TRUE.';
 
 
 CREATE TABLE "unit" (
@@ -3843,6 +3843,7 @@
             AND "initiative"."favored_to_status_quo"
             AND (
               "policy"."no_multistage_majority" = FALSE OR
+              "policy"."majority_indirect" = TRUE OR
               "initiative"."multistage_majority" = FALSE )
             AND (
               "policy"."no_reverse_beat_path" = FALSE OR