diff --git a/ChangeLog b/ChangeLog index 91eaa3f7ebc133f61be7f480906920d9be397b3f..26afc1a3063b5d8f5bba291dba79d1ecf34dfd96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-09-02 Per Cederqvist + + Rename the aux-item field "unique" to "one-per-person". + (Preparation for solving bug 327). + * doc/lyskomd.texi (Aux-Item Definition File): Renamed the + "unique" field to "one-per-person", and clarify what it means. + * src/server/aux-item-def-parse.y: Track the name change of the + "one-per-person" aux-item field. + (parse_aux_item_definitions): Ditto. + * run-support/aux-items.conf: Ditto. + * src/server/testsuite/leaks.0/lots-aux-items.conf: Ditto. + * src/server/testsuite/lyskomd.0/aux-items.conf: Ditto. + * src/server/testsuite/lyskomd.0/bug-64.aux: Ditto. + 2006-08-04 Per Cederqvist Add more test cases for Local_to_global. (Bug 217). diff --git a/doc/lyskomd.texi b/doc/lyskomd.texi index 31cae52ccfd6322f63dc3d1fa82d581714e483e0..28d683309f4fbb4415efcc12f3e3c03c1b48a381 100644 --- a/doc/lyskomd.texi +++ b/doc/lyskomd.texi @@ -936,9 +936,10 @@ Boolean, default false. When true, aux-items with this tag cannot be deleted once they have been created. (They will be deleted automatically when the object they are assigned to is deleted.) -@item unique +@item one-per-person Boolean, default false. When true, there can only be one non-deleted -item with this tag per creator. +item with this tag per person that creates this aux-item on the +object. @item unique-data Boolean, default false. When true, there can only be one non-deleted diff --git a/run-support/aux-items.conf b/run-support/aux-items.conf index a1d319461297184eda3d14ddac73269aa27fb717..09e0a57bfc33c79e66110941088faa67c723f69a 100644 --- a/run-support/aux-items.conf +++ b/run-support/aux-items.conf @@ -37,7 +37,7 @@ 1 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -86,7 +86,7 @@ dont-garb = false; inherit = false; inherit-limit = 1; - unique = true; + one-per-person = true; validate = "^$"; } @@ -103,7 +103,7 @@ dont-garb = false; inherit = false; inherit-limit = 1; - unique = true; + one-per-person = true; validate = "^$"; } @@ -115,7 +115,7 @@ 6 : request-confirmation (text) { secret = false; - unique = true; + one-per-person = true; author-only = true; dont-garb = false; inherit = false; @@ -254,7 +254,7 @@ { author-only = true; permanent = true; - unique = true; + one-per-person = true; hide-creator = false; dont-garb = false; inherit = false; @@ -267,7 +267,7 @@ 16 : mx-author (create text) { author-only = true; - unique = true; + one-per-person = true; inherit = false; hide-creator = false; dont-garb = false; @@ -281,7 +281,7 @@ 17 : mx-from (text) { author-only = true; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; dont-garb = false; @@ -295,7 +295,7 @@ 18 : mx-reply-to (text) { author-only = true; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; dont-garb = false; @@ -309,7 +309,7 @@ 19 : mx-to (text) { author-only = false; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; secret = false; @@ -323,7 +323,7 @@ 20 : mx-cc (text) { author-only = false; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; secret = false; @@ -337,7 +337,7 @@ 21 : mx-date (text) { author-only = true; - unique = true; + one-per-person = true; inherit = false; hide-creator = false; secret = false; @@ -352,7 +352,7 @@ 22 : mx-message-id (text) { author-only = true; - unique = true; + one-per-person = true; inherit = false; hide-creator = false; secret = false; @@ -366,7 +366,7 @@ 23 : mx-in-reply-to (text) { author-only = true; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; secret = false; @@ -380,7 +380,7 @@ 24 : mx-misc (text) { author-only = true; - unique = true; + one-per-person = true; inherit = false; hide-creator = false; secret = false; @@ -395,7 +395,7 @@ 25 : mx-allow-filter (conference, letterbox) disabled { author-only = true; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; secret = false; @@ -410,7 +410,7 @@ 26 : mx-reject-forward (conference, letterbox) disabled { author-only = true; - unique = false; + one-per-person = false; inherit = false; hide-creator = false; secret = false; @@ -476,7 +476,7 @@ 31 : canonical-name (server) { supervisor-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -491,7 +491,7 @@ 32 : mx-list-name (conference) { author-only = true; - unique = true; + one-per-person = true; owner-delete = true; secret = false; hide-creator = false; @@ -508,7 +508,7 @@ 33 : send-comments-to (letterbox) { author-only = true; - unique = true; + one-per-person = true; owner-delete = true; secret = false; hide-creator = false; @@ -522,7 +522,7 @@ 34 : world-readable (text) { author-only = true; - unique = true; + one-per-person = true; owner-delete = true; secret = false; dont-garb = false; @@ -545,7 +545,7 @@ validate = "^(all|spam|html)$"; dont-garb = false; inherit = false; - unique = false; + one-per-person = false; } # @@ -589,7 +589,7 @@ secret = false; hide-creator = false; dont-garb = false; - unique = true; + one-per-person = true; } # @@ -599,7 +599,7 @@ 10103 : mx-envelope-sender (text) { author-only = true; - unique = false; + one-per-person = false; inherit = false; secret = false; hide-creator = false; diff --git a/src/server/aux-item-def-parse.y b/src/server/aux-item-def-parse.y index 2cc9cf415ad5019740735121968bd673877c38af..33d33f8dbb4a999b251557fce6bb24e9e7659c59 100644 --- a/src/server/aux-item-def-parse.y +++ b/src/server/aux-item-def-parse.y @@ -264,7 +264,8 @@ assign : ID '=' value ';' BOOLEAN, $1, &$3, @3.first_line); chk_assign(&found, &good, "inherit-limit", &def.inherit_limit, NUMBER, $1, &$3, @3.first_line); - chk_assign(&found, &good, "unique", &def.one_per_person, + chk_assign(&found, &good, "one-per-person", + &def.one_per_person, BOOLEAN, $1, &$3, @3.first_line); chk_assign(&found, &good, "unique-data", &def.unique_data, BOOLEAN, $1, &$3, @3.first_line); @@ -591,7 +592,7 @@ void parse_aux_item_definitions(char *file) fprintf(stderr, "\n"); fprintf(stderr, "Author only: %d\n", def->author_only); fprintf(stderr, "Supervisor only: %d\n", def->supervisor_only); - fprintf(stderr, "Unique: %d\n", def->one_per_person); + fprintf(stderr, "One-per-person: %d\n", def->one_per_person); fprintf(stderr, "Unique-data: %d\n", def->unique_data); fprintf(stderr, "Permanent: %d\n", def->may_not_delete); fprintf(stderr, "Inherit limit: %ld\n", def->inherit_limit); diff --git a/src/server/testsuite/leaks.0/lots-aux-items.conf b/src/server/testsuite/leaks.0/lots-aux-items.conf index ceb48bb84117019acb503c878a0f24f1934c3cae..d1335483a07a27c00970fe7382f05bd450cac9b4 100644 --- a/src/server/testsuite/leaks.0/lots-aux-items.conf +++ b/src/server/testsuite/leaks.0/lots-aux-items.conf @@ -30,7 +30,7 @@ 1 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -46,7 +46,7 @@ 100 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -62,7 +62,7 @@ 101 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -78,7 +78,7 @@ 102 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -94,7 +94,7 @@ 103 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -110,7 +110,7 @@ 104 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -126,7 +126,7 @@ 105 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -142,7 +142,7 @@ 106 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -158,7 +158,7 @@ 107 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -174,7 +174,7 @@ 108 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -190,7 +190,7 @@ 109 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -268,7 +268,7 @@ 6 : request-confirmation (text) { secret = false; - unique = true; + one-per-person = true; dont-garb = false; inherit = false; inherit-limit = 1; @@ -393,7 +393,7 @@ { author-only = true; permanent = true; - unique = true; + one-per-person = true; hide-creator = false; dont-garb = false; inherit = false; @@ -406,7 +406,7 @@ 16 : mx-author (create text) { author-only = true; - unique = true; + one-per-person = true; } # @@ -416,7 +416,7 @@ 17 : mx-from (text) { author-only = true; - unique = false; + one-per-person = false; } # @@ -426,7 +426,7 @@ 18 : mx-reply-to (text) { author-only = true; - unique = false; + one-per-person = false; } # @@ -436,7 +436,7 @@ 19 : mx-to (text) { author-only = false; - unique = false; + one-per-person = false; hide-creator = false; secret = false; } @@ -448,7 +448,7 @@ 20 : mx-cc (text) { author-only = false; - unique = false; + one-per-person = false; hide-creator = false; secret = false; } @@ -460,7 +460,7 @@ 21 : mx-date (text) { author-only = true; - unique = true; + one-per-person = true; inherit = false; validate = "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\( [-+][0-9][0-9][0-9][0-9]\\)?"; } @@ -472,7 +472,7 @@ 22 : mx-message-id (text) { author-only = true; - unique = true; + one-per-person = true; } # @@ -482,7 +482,7 @@ 23 : mx-in-reply-to (text) { author-only = true; - unique = false; + one-per-person = false; } # @@ -492,7 +492,7 @@ 24 : mx-misc (text) { author-only = true; - unique = true; + one-per-person = true; } # @@ -503,7 +503,7 @@ 25 : mx-allow-filter (conference, letterbox) disabled { author-only = true; - unique = false; + one-per-person = false; } # @@ -514,7 +514,7 @@ 26 : mx-reject-forward (conference, letterbox) disabled { author-only = true; - unique = false; + one-per-person = false; } # diff --git a/src/server/testsuite/lyskomd.0/aux-items.conf b/src/server/testsuite/lyskomd.0/aux-items.conf index 687e9826ef850a4accced106ae10699dc8ff626d..478837e4fbf8444e8b523a5ef28d5b9b5efe935d 100644 --- a/src/server/testsuite/lyskomd.0/aux-items.conf +++ b/src/server/testsuite/lyskomd.0/aux-items.conf @@ -94,9 +94,9 @@ supervisor-only = true; } -2006 : unique (any) +2006 : one-per-person (any) { - unique = true; + one-per-person = true; } 2007 : permanent (any) diff --git a/src/server/testsuite/lyskomd.0/bug-64.aux b/src/server/testsuite/lyskomd.0/bug-64.aux index b82addba18fd343c9ffc0d5fabe5657de8d9fa39..9cc442c5f60c012696363f30c810ddef18f5bf7c 100644 --- a/src/server/testsuite/lyskomd.0/bug-64.aux +++ b/src/server/testsuite/lyskomd.0/bug-64.aux @@ -1,7 +1,7 @@ 1 : content-type (text) { author-only = true; - unique = true; + one-per-person = true; secret = false; hide-creator = false; dont-garb = false; @@ -50,7 +50,7 @@ dont-garb = false; inherit = false; inherit-limit = 1; - unique = true; + one-per-person = true; validate = "^$"; } @@ -67,7 +67,7 @@ dont-garb = false; inherit = false; inherit-limit = 1; - unique = true; + one-per-person = true; validate = "^$"; }