Index: edit.c =================================================================== RCS file: /cvsroot/gnats/gnats/gnats/edit.c,v retrieving revision 1.62 diff -u -p -r1.62 edit.c --- edit.c 23 Apr 2005 05:03:49 -0000 1.62 +++ edit.c 28 Dec 2005 01:48:27 -0000 @@ -135,79 +135,47 @@ applyChangeAction (ChangeActions action, } static int -addAuditEntryP (const DatabaseInfo database, FieldIndex field, - ChangeActions actions) +applyChangeActions (PR *pr, PR *oldPR, FieldIndex field, + ChangeActions actions, ErrorDesc *err, + FormatNamedParameter *params) { - while (actions != NULL) - { - if (actions->addAuditTrail) - { - return 1; - } - actions = actions->next; - } + ChangeActions actionList = actions; - if (fieldDefForIndex (field)->datatype != MultiText) + while (actionList != NULL) { - ChangeActions globalActions = globalChangeActions (database); - - while (globalActions != NULL) + if (actionList->expr == NULL + || pr_matches_expr (pr, oldPR, actionList->expr, params)) { - if (globalActions->addAuditTrail) + if (applyChangeAction (actionList, pr, oldPR, field, err, params)) { return 1; } - globalActions = globalActions->next; + + if (field != InvalidFieldIndex && actionList->addAuditTrail) + { + addAuditTrailEnt (pr, actionList->auditTrailFormat, params, err); + } } + actionList = actionList->next; } - return 0; -} - -static int -applyChangeActions (PR *pr, PR *oldPR, FieldIndex field, - ChangeActions actions, ErrorDesc *err, - FormatNamedParameter *params) -{ - { - ChangeActions actionList = actions; - while (actionList != NULL) - { - if (actionList->expr == NULL - || pr_matches_expr (pr, oldPR, actionList->expr, params)) - { - if (applyChangeAction (actionList, pr, oldPR, field, err, params)) - { - return 1; - } - } - actionList = actionList->next; - } - } - - if (field != InvalidFieldIndex && addAuditEntryP (pr->database, - field, actions)) + if (field != InvalidFieldIndex) { - ChangeActions action = actions; - while (actions != NULL) + if (fieldDefForIndex (field)->datatype != MultiText) { - if (actions->addAuditTrail) + ChangeActions globalActions = globalChangeActions (pr->database); + + while (globalActions != NULL) { - break; + if (globalActions->addAuditTrail) + { + addAuditTrailEnt (pr, globalActions->auditTrailFormat, + params, err); + } + globalActions = globalActions->next; } - actions = actions->next; - } - - if (action != NULL) - { - addAuditTrailEnt (pr, action->auditTrailFormat, params, err); - } - else - { - addAuditTrailEnt (pr, NULL, params, err); } } - return 0; }