1.1 --- a/core.sql	Fri Jun 03 13:28:51 2011 +0200
     1.2 +++ b/core.sql	Fri Jun 03 14:03:29 2011 +0200
     1.3 @@ -337,7 +337,7 @@
     1.4  COMMENT ON COLUMN "policy"."majority_non_negative" IS 'Absolute number of sum of "positive_votes" and abstentions neccessary for an initiative to be "attainable".';
     1.5  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';
     1.6  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".';
     1.7 -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".';
     1.8 +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.';
     1.9  
    1.10  
    1.11  CREATE TABLE "unit" (
    1.12 @@ -3843,6 +3843,7 @@
    1.13              AND "initiative"."favored_to_status_quo"
    1.14              AND (
    1.15                "policy"."no_multistage_majority" = FALSE OR
    1.16 +              "policy"."majority_indirect" = TRUE OR
    1.17                "initiative"."multistage_majority" = FALSE )
    1.18              AND (
    1.19                "policy"."no_reverse_beat_path" = FALSE OR