# HG changeset patch
# User jbe
# Date 1307181044 -7200
# Node ID 725133783c8ad4b4cd66e8bebe32da094f31e6c6
# Parent  fb5dc1bf921fbcceec397c6edb993cb04ddd9c67
Do not ignore the "policy"."no_multistage_majority" flag: It does not affect the winner but affects the "initiative"."eligible" flag

diff -r fb5dc1bf921f -r 725133783c8a core.sql
--- a/core.sql	Fri Jun 03 14:03:29 2011 +0200
+++ b/core.sql	Sat Jun 04 11:50:44 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". This flag is ignored, if "policy"."majority_indirect" is set to TRUE.';
+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 does not affect the winner, if "policy"."majority_indirect" is set to TRUE or "policy"."majority_num" is set to zero.';
 
 
 CREATE TABLE "unit" (
@@ -3843,7 +3843,6 @@
             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