Merging QofBook structures
[Query Object Framework]

---

Detailed Description

Collision handling principles.

1. Always check for a GUID first and compare. qof_book_merge only accepts valid QofBook data and therefore ALL objects in the import book will include valid GUID's.
2. If the original import data did not contain a GUID (e.g. an external non-GnuCash source) the GUID values will have been created during the import and will not match any existing GUID's in the target book so objects that do not have a GUID match cannot be assumed to be MERGE_NEW - parameter values must be checked.
3. If import contains data from closed books, store the data from the closed books in the current book as active. i.e. re-open the books.

• If a GUID match exists, set qof_book_mergeRule::mergeAbsolute to TRUE.
  1. If ALL parameters in the import object match the target object with the same GUID, set qof_book_mergeResult to MERGE_ABSOLUTE.
  2. If any parameters differ, set MERGE_UPDATE.
• If the import object GUID does not match an existing object, mergeAbsolute is unchanged from the default FALSE The parameter values of the object are compared to other objects of the same type in the target book.
  1. If the same data exists in the target book with a different GUID, the object is tagged as DUPLICATE.
  2. If the data has changed, the object is tagged as REPORT.
  3. If the data does not match, the object is tagged as NEW

More information is at http://code.neil.williamsleesmill.me.uk/

Each foreach function uses g_return_if_fail checks to protect the target book. If any essential data is missing, the loop returns without changing the target book. Note that this will not set or return an error value. However, g_return is only used for critical errors that arise from programming errors, not for invalid import data which should be cleaned up before creating the import QofBook.

Only qof_book_mergeUpdateResult and qof_book_mergeCommit return any error values to the calling process. qof_book_mergeInit returns a pointer to the qof_book_mergeData struct - the calling process needs to make sure this is non-NULL to know that the Init has been successful.

Files
file	qof_book_merge.h
	API for merging two QofBook structures with collision handling.
Data Structures
struct	qof_book_mergeRule
	One rule per entity, built into a single GList for the entire merge. More...
struct	qof_book_mergeData
	mergeData contains the essential context data for any merge. More...
qof_book_merge API
typedef void(*	qof_book_mergeRuleForeachCB )(qof_book_mergeData *, qof_book_mergeRule *, guint)
	Definition of the dialog control callback routine.
qof_book_mergeData *	qof_book_mergeInit (QofBook *importBook, QofBook *targetBook)
	Initialise the qof_book_merge process.
void	qof_book_mergeRuleForeach (qof_book_mergeData *mergeData, qof_book_mergeRuleForeachCB callback, qof_book_mergeResult mergeResult)
	Dialog Control Callback.
char *	qof_book_merge_param_as_string (QofParam *qtparam, QofEntity *qtEnt)
	provides easy string access to parameter data for dialog use
qof_book_mergeData *	qof_book_mergeUpdateResult (qof_book_mergeData *mergeData, qof_book_mergeResult tag)
	called by dialog callback to set the result of user intervention
int	qof_book_mergeCommit (qof_book_mergeData *mergeData)
	Commits the import data to the target book.
void	qof_book_merge_abort (qof_book_mergeData *mergeData)
	Abort the merge and free all memory allocated by the merge.
Enumerations
enum	qof_book_mergeResult {   MERGE_UNDEF, MERGE_ABSOLUTE, MERGE_NEW, MERGE_REPORT,   MERGE_DUPLICATE, MERGE_UPDATE, MERGE_INVALID }
	Results of collisions and user resolution. More...

---

Typedef Documentation

typedef void(* qof_book_mergeRuleForeachCB)(qof_book_mergeData *, qof_book_mergeRule *, guint)

Definition of the dialog control callback routine. All MERGE_REPORT rules must be offered for user intervention using this template. Commit will fail if any rules are still tagged as MERGE_REPORT. Calling processes are free to also offer MERGE_NEW, MERGE_UPDATE, MERGE_DUPLICATE and MERGE_ABSOLUTE for user intervention. Attempting to query MERGE_INVALID rules will cause an error. For an example, consider test_rule_loop, declared as: void test_rule_loop(qof_book_mergeData *mergeData, qof_book_mergeRule *rule, guint remainder); void test_rule_loop(qof_book_mergeData *mergeData, qof_book_mergeRule *rule, guint remainder) { g_return_if_fail(rule != NULL); g_return_if_fail(mergeData != NULL); printf("Rule Result %s", rule->mergeType); qof_book_mergeUpdateResult(mergeData, rule, MERGE_UPDATE); } The dialog is free to call qof_book_mergeUpdateResult in the loop or at the end as long as the link between the rule and the result is maintained, e.g. by using a GHashTable. The parameters are: data : pointer to the qof_book_mergeData metadata context returned by Init. rule : pointer to the qof_book_mergeRule that generated the collision report remainder : guint value returned from g_slist_length for the number of other rules remaining with the same result. This might be useful for a progress dialog, it might not. When updating MERGE_REPORT, remainder must equal zero before calling qof_book_mergeCommit or the import will abort. If the dialog sets any rule result to MERGE_INVALID, the import will abort when qof_book_mergeCommit is called. It is the responsibility of the calling function to handle the error code from qof_book_mergeCommit, close the dialog and return. The merge routines in these files will already have halted the merge operation and freed any memory allocated to merge structures before returning the error code. There is no need for the dialog process to report back to qof_book_merge in this situation. Definition at line 287 of file qof_book_merge.h.

---

Enumeration Type Documentation

enum qof_book_mergeResult

Results of collisions and user resolution. All rules are initialised as MERGE_UNDEF. Once the comparison is complete, each object within the import will be updated. MERGE_ABSOLUTE, MERGE_NEW, MERGE_DUPLICATE and MERGE_UPDATE can be reported to the user along with all MERGE_REPORT objects for confirmation. It may be useful later to allow MERGE_ABSOLUTE, MERGE_NEW, MERGE_DUPLICATE and MERGE_UPDATE to not be reported, if the user sets a preferences option for each result. (Always accept new items: Y/N default NO, ignores all MERGE_NEW if set to Y etc.) This option would not require any changes to qof_book_merge. MERGE_NEW, MERGE_DUPLICATE and MERGE_UPDATE are only actioned after conflicts are resolved by the user using a dialog and all MERGE_REPORT objects are re-assigned to one of MERGE_NEW, MERGE_DUPLICATE or MERGE_UPDATE. There is no automatic merge, even if no entities are tagged as MERGE_REPORT, the calling process must still check for REPORT items using qof_book_mergeRuleForeach and call qof_book_mergeCommit. MERGE_INVALID data should be rare and allows for user-abort - the imported file/source may be corrupted and the prescence of invalid data should raise concerns that the rest of the data may be corrupted, damaged or otherwise altered. If any entity is tagged as MERGE_INVALID, the merge operation will abort and leave the target book completely unchanged. MERGE_ABSOLUTE is only used for a complete match. The import object contains the same data in the same parameters with no omissions or amendments. If any data is missing, amended or added, the data is labelled MERGE_UPDATE. Every piece of data has a corresponding result. Only when the count of items labelled MERGE_REPORT is equal to zero are MERGE_NEW and MERGE_UPDATE items added to the existing book. MERGE_DUPLICATE items are silently ignored. Aborting the dialog/process (by the user or in a program crash) at any point before the final commit leaves the existing book completely untouched. Enumerator: MERGE_UNDEF  default value before comparison is made. MERGE_ABSOLUTE  GUID exact match, no new data - ignore MERGE_NEW  import object does not exist in the target book - add MERGE_REPORT  import object needs user intervention - report MERGE_DUPLICATE  import object with different GUID exactly matches existing GUID - ignore MERGE_UPDATE  import object matches an existing entity but includes new or modified parameter data - update MERGE_INVALID  import object didn't match registered object or parameter types or user decided to abort - abort Definition at line 118 of file qof_book_merge.h. { MERGE_UNDEF, MERGE_ABSOLUTE, MERGE_NEW, MERGE_REPORT, MERGE_DUPLICATE, MERGE_UPDATE, MERGE_INVALID }qof_book_mergeResult;

---

Function Documentation

void qof_book_merge_abort (  qof_book_mergeData *  mergeData  )

Abort the merge and free all memory allocated by the merge. Sometimes, setting MERGE_INVALID is insufficient: e.g. if the user aborts the merge from outside the functions dealing with the merge ruleset. This function causes an immediate abort - the calling process must start again at Init if a new merge is required. Definition at line 762 of file qof_book_merge.c. { qof_book_mergeRule *currentRule; g_return_if_fail(mergeData != NULL); while(mergeData->mergeList != NULL) { currentRule = mergeData->mergeList->data; g_slist_free(currentRule->linkedEntList); g_slist_free(currentRule->mergeParam); g_free(mergeData->mergeList->data); if(currentRule) { g_slist_free(currentRule->linkedEntList); g_slist_free(currentRule->mergeParam); g_free(currentRule); } mergeData->mergeList = g_list_next(mergeData->mergeList); } g_list_free(mergeData->mergeList); g_slist_free(mergeData->mergeObjectParams); g_slist_free(mergeData->targetList); if(mergeData->orphan_list != NULL) { g_slist_free(mergeData->orphan_list); } g_hash_table_destroy(mergeData->target_table); g_free(mergeData); }

char* qof_book_merge_param_as_string (  QofParam *  qtparam, QofEntity *  qtEnt )

provides easy string access to parameter data for dialog use Uses the param_getfcn to retrieve the parameter value as a string, suitable for display in dialogs and user intervention output. Within a qof_book_merge context, only the parameters used in the merge are available, i.e. parameters where both param_getfcn and param_setfcn are not NULL. Note that the object type description (a full text version of the object name) is also available to the dialog as qof_book_mergeRule::mergeLabel. This allows the dialog to display the description of the object and all parameter data. Definition at line 798 of file qof_book_merge.c. { gchar *param_string, param_date[QOF_DATE_STRING_LENGTH]; char param_sa[GUID_ENCODING_LENGTH + 1]; QofType paramType; const GUID *param_guid; time_t param_t; gnc_numeric param_numeric, (*numeric_getter) (QofEntity*, QofParam*); Timespec param_ts, (*date_getter) (QofEntity*, QofParam*); double param_double, (*double_getter) (QofEntity*, QofParam*); gboolean param_boolean, (*boolean_getter) (QofEntity*, QofParam*); gint32 param_i32, (*int32_getter) (QofEntity*, QofParam*); gint64 param_i64, (*int64_getter) (QofEntity*, QofParam*); char param_char, (*char_getter) (QofEntity*, QofParam*); param_string = NULL; paramType = qtparam->param_type; if(safe_strcmp(paramType, QOF_TYPE_STRING) == 0) { param_string = g_strdup(qtparam->param_getfcn(qtEnt,qtparam)); if(param_string == NULL) { param_string = ""; } return param_string; } if(safe_strcmp(paramType, QOF_TYPE_DATE) == 0) { date_getter = (Timespec (*)(QofEntity*, QofParam*))qtparam->param_getfcn; param_ts = date_getter(qtEnt, qtparam); param_t = timespecToTime_t(param_ts); strftime(param_date, QOF_DATE_STRING_LENGTH, QOF_UTC_DATE_FORMAT, gmtime(&param_t)); param_string = g_strdup(param_date); return param_string; } if((safe_strcmp(paramType, QOF_TYPE_NUMERIC) == 0) || (safe_strcmp(paramType, QOF_TYPE_DEBCRED) == 0)) { numeric_getter = (gnc_numeric (*)(QofEntity*, QofParam*)) qtparam->param_getfcn; param_numeric = numeric_getter(qtEnt,qtparam); param_string = g_strdup(gnc_numeric_to_string(param_numeric)); return param_string; } if(safe_strcmp(paramType, QOF_TYPE_GUID) == 0) { param_guid = qtparam->param_getfcn(qtEnt,qtparam); guid_to_string_buff(param_guid, param_sa); param_string = g_strdup(param_sa); return param_string; } if(safe_strcmp(paramType, QOF_TYPE_INT32) == 0) { int32_getter = (gint32 (*)(QofEntity*, QofParam*)) qtparam->param_getfcn; param_i32 = int32_getter(qtEnt, qtparam); param_string = g_strdup_printf("%d", param_i32); return param_string; } if(safe_strcmp(paramType, QOF_TYPE_INT64) == 0) { int64_getter = (gint64 (*)(QofEntity*, QofParam*)) qtparam->param_getfcn; param_i64 = int64_getter(qtEnt, qtparam); param_string = g_strdup_printf("%" G_GINT64_FORMAT, param_i64); return param_string; } if(safe_strcmp(paramType, QOF_TYPE_DOUBLE) == 0) { double_getter = (double (*)(QofEntity*, QofParam*)) qtparam->param_getfcn; param_double = double_getter(qtEnt, qtparam); param_string = g_strdup_printf("%f", param_double); return param_string; } if(safe_strcmp(paramType, QOF_TYPE_BOOLEAN) == 0){ boolean_getter = (gboolean (*)(QofEntity*, QofParam*)) qtparam->param_getfcn; param_boolean = boolean_getter(qtEnt, qtparam); /* Boolean values need to be lowercase for QSF validation. */ if(param_boolean == TRUE) { param_string = g_strdup("true"); } else { param_string = g_strdup("false"); } return param_string; } /* "kvp" contains repeating values, cannot be a single string for the frame. */ if(safe_strcmp(paramType, QOF_TYPE_KVP) == 0) { return param_string; } if(safe_strcmp(paramType, QOF_TYPE_CHAR) == 0) { char_getter = (char (*)(QofEntity*, QofParam*)) qtparam->param_getfcn; param_char = char_getter(qtEnt, qtparam); param_string = g_strdup_printf("%c", param_char); return param_string; } return NULL; }

int qof_book_mergeCommit (  qof_book_mergeData *  mergeData  )

Commits the import data to the target book. The last function in the API and the final part of any qof_book_merge operation. qof_book_mergeCommit will abort the entire merge operation if any rule is set to MERGE_INVALID. It is the responsibility of the calling function to handle the error code from qof_book_mergeCommit, close the dialog and return. qof_book_mergeCommit will already have halted the merge operation and freed any memory allocated to all merge structures before returning the error code. There is no way for the dialog process to report back to qof_book_merge in this situation. qof_book_mergeCommit checks for any entities still tagged as MERGE_REPORT and then proceeds to import all entities tagged as MERGE_UPDATE or MERGE_NEW into the target book. This final process cannot be UNDONE! Parameters: mergeData  the merge context, qof_book_mergeData* Returns: -2 if any rules are tagged as MERGE_INVALID mergeData will have been g_free'd). note that this will be before any operations are done on the target QofBook. -1 if mergeData is invalid or no merge has been initialised with qof_book_mergeInit - the calling process must check the value of mergeData +1 if some entities are still tagged as MERGE_REPORT - use qof_book_mergeUpdateRule and try again (mergeData is retained). 0 on success - mergeData will have been freed. Definition at line 917 of file qof_book_merge.c. { qof_book_mergeRule *currentRule; GList *check; g_return_val_if_fail(mergeData != NULL, -1); g_return_val_if_fail(mergeData->mergeList != NULL, -1); g_return_val_if_fail(mergeData->targetBook != NULL, -1); if(mergeData->abort == TRUE) return -1; check = g_list_copy(mergeData->mergeList); g_return_val_if_fail(check != NULL, -1); while(check != NULL) { currentRule = check->data; if(currentRule->mergeResult == MERGE_INVALID) { qof_book_merge_abort(mergeData); return(-2); } if(currentRule->mergeResult == MERGE_REPORT) { g_list_free(check); return 1; } check = g_list_next(check); } qof_book_mergeCommitForeach( qof_book_mergeCommitRuleLoop, MERGE_NEW, mergeData); qof_book_mergeCommitForeach( qof_book_mergeCommitRuleLoop, MERGE_UPDATE, mergeData); /* Placeholder for QofObject merge_helper_cb - all objects and all parameters set */ while(mergeData->mergeList != NULL) { currentRule = mergeData->mergeList->data; g_slist_free(currentRule->mergeParam); g_slist_free(currentRule->linkedEntList); mergeData->mergeList = g_list_next(mergeData->mergeList); } g_list_free(mergeData->mergeList); g_slist_free(mergeData->mergeObjectParams); g_slist_free(mergeData->targetList); if(mergeData->orphan_list != NULL) { g_slist_free(mergeData->orphan_list); } g_hash_table_destroy(mergeData->target_table); g_free(mergeData); return 0; }

qof_book_mergeData* qof_book_mergeInit (  QofBook *  importBook, QofBook *  targetBook )

Initialise the qof_book_merge process. First function of the qof_book_merge API. Every merge must begin with Init. Requires the book to import (QofBook *) and the book to receive the import, the target book (QofBook *). Returns a pointer to qof_book_mergeData which must be checked for a NULL before continuing. Process: Invoke the callback qof_book_mergeForeachType on every registered object class definition. Callback obtains the registered parameter list for each object type. This provides run time access to all registered objects and all object parameters without any changes to qof_book_merge - no registered object or parameter is omitted from any merge operation. Use qof_object_foreach to invoke the callback qof_book_mergeForeach, one object at a time on every instance stored in mergeBook. This is the first point where real data from the import book is accessed. qof_book_mergeForeach obtains the GUID for the object from the import book and runs the first check on the original book, checking for any exact GUID match. With the full parameter list, the rules for this object can be created. If there is a GUID match, the data in each parameter of the import object is compared with the same semantic object in the original book. If there is no GUID in the import object or no GUID match with the original book, the original book is searched to find a parameter match - checking for a MERGE_DUPLICATE result. qof_book_mergeCompare sets the qof_book_mergeResult of the comparison. Inserts the completed rule into qof_book_mergeData::mergeList GSList. Returns: NULL in case of error, otherwise a qof_book_mergeData* metadata context. Definition at line 724 of file qof_book_merge.c. { qof_book_mergeData *mergeData; qof_book_mergeRule *currentRule; GList *check; g_return_val_if_fail((importBook != NULL)&&(targetBook != NULL), NULL); mergeData = g_new(qof_book_mergeData, 1); mergeData->abort = FALSE; mergeData->mergeList = NULL; mergeData->targetList = NULL; mergeData->mergeBook = importBook; mergeData->targetBook = targetBook; mergeData->mergeObjectParams = NULL; mergeData->orphan_list = NULL; mergeData->target_table = g_hash_table_new( g_direct_hash, qof_book_merge_rule_cmp); currentRule = g_new(qof_book_mergeRule, 1); mergeData->currentRule = currentRule; qof_object_foreach_type(qof_book_mergeForeachType, mergeData); g_return_val_if_fail(mergeData->mergeObjectParams, NULL); if(mergeData->orphan_list != NULL) { qof_book_merge_match_orphans(mergeData); } check = g_list_copy(mergeData->mergeList); while(check != NULL) { currentRule = check->data; if(currentRule->mergeResult == MERGE_INVALID) { mergeData->abort = TRUE; return(NULL); } check = g_list_next(check); } g_list_free(check); return mergeData; }

void qof_book_mergeRuleForeach (  qof_book_mergeData *  mergeData, qof_book_mergeRuleForeachCB  callback, qof_book_mergeResult  mergeResult )

Dialog Control Callback. This function is designed to be used to iterate over all rules tagged with a specific qof_book_mergeResult value. Parameters: callback  external loop of type qof_book_mergeRuleForeachCB mergeResult  qof_book_mergeResult value to look up. mergeData  qof_book_mergeData merge context. Note : MERGE_NEW causes a new entity to be created in the target book at Commit which is then assigned as the targetEnt of that rule. If mergeResult == MERGE_NEW, the rules returned by qof_book_mergeRuleForeach will have a NULL set for the targetEnt. This is because Commit has not yet been called and no changes can be made to the target book. The calling process must handle the NULL targetEnt and NOT call any param_getfcn routines for the target entity. The import entity is available for display. Uses qof_book_get_collection with the qof_book_mergeRule::mergeType object type to return a collection of QofEntity entities from either the qof_book_mergeData::mergeBook or qof_book_mergeData::targetBook. Then uses qof_collection_lookup_entity to lookup the qof_book_mergeRule::importEnt and again the qof_book_mergeRule::targetEnt to return the two specific entities. Definition at line 959 of file qof_book_merge.c. { struct qof_book_mergeRuleIterate iter; qof_book_mergeRule *currentRule; GList *matching_rules; g_return_if_fail(cb != NULL); g_return_if_fail(mergeData != NULL); currentRule = mergeData->currentRule; g_return_if_fail(mergeResult > 0); g_return_if_fail(mergeResult != MERGE_INVALID); g_return_if_fail(mergeData->abort == FALSE); iter.fcn = cb; iter.data = mergeData; matching_rules = NULL; iter.ruleList = g_list_copy(mergeData->mergeList); while(iter.ruleList!=NULL) { currentRule = iter.ruleList->data; if(currentRule->mergeResult == mergeResult) { matching_rules = g_list_prepend(matching_rules, currentRule); } iter.ruleList = g_list_next(iter.ruleList); } iter.remainder = g_list_length(matching_rules); g_list_foreach (matching_rules, qof_book_mergeRuleCB, &iter); g_list_free(matching_rules); }

qof_book_mergeData* qof_book_mergeUpdateResult (  qof_book_mergeData *  mergeData, qof_book_mergeResult  tag )

called by dialog callback to set the result of user intervention Set any rule result to MERGE_INVALID to abort the import when qof_book_mergeCommit is called, without changing the target book. The calling process should make it absolutely clear that a merge operation cannot be undone and that a backup copy should always be available before a merge is initialised. Recommended method: Only offer three options to the user per rule: Allow import data to be merged into target data change MERGE_REPORT to MERGE_UPDATE Allow import data without an exact match to be added as new change MERGE_REPORT to MERGE_NEW IF mergeAbsolute = FALSE Ignore import data and leave target data unchanged change MERGE_REPORT to MERGE_ABSOLUTE or MERGE_DUPLICATE Handle the required result changes in code: Check the value of qof_book_mergeRule::mergeAbsolute and use these principles: To ignore entities tagged as: MERGE_REPORT, you must check the value of mergeAbsolute. if mergeAbsolute is TRUE, change MERGE_REPORT to MERGE_ABSOLUTE if mergeAbsolute is FALSE, change MERGE_REPORT to MERGE_DUPLICATE MERGE_NEW, set MERGE_DUPLICATE. MERGE_UPDATE, you must check the value of mergeAbsolute. if mergeAbsolute is TRUE, change MERGE_UPDATE to MERGE_ABSOLUTE if mergeAbsolute is FALSE, change MERGE_UPDATE to MERGE_DUPLICATE To merge entities that are not pre-set to MERGE_NEW, set MERGE_UPDATE. Attempting to merge an entity when the pre-set value was MERGE_NEW will force a change back to MERGE_NEW because no suitable target exists for the merge. To add entities, check mergeAbsolute is FALSE and set MERGE_NEW. An entity only be added if mergeAbsolute is FALSE. Attempting to add an entity when mergeAbsolute is TRUE will always force a MERGE_UPDATE. It is not possible to update the same rule more than once. MERGE_NEW is reserved for new objects and is only pre-set if all parameters, including GUID, have already failed to match any relevant object. qof_book_mergeCommit will create new entities for all rules tagged as MERGE_NEW. if mergeAbsolute is TRUE and the user wants to import the data, requests to set MERGE_NEW will be forced to MERGE_UPDATE because an entity with that GUID already exists in the target book. if MERGE_NEW is pre-set, requests to change to MERGE_UPDATE will be ignored because a new entity is needed. MERGE_UPDATE is reserved for existing objects - qof_book_mergeCommit will require a matching entity to update and will force a change to back to MERGE_NEW if none is known to exist, using the principle above. MERGE_INVALID will cause an abort of the merge process. MERGE_UNDEF and MERGE_REPORT cannot be set - the entity result will be unchanged. MERGE_DUPLICATE and MERGE_ABSOLUTE are handled identically but are semantically different - qof_book_mergeRule::mergeAbsolute is used to dictate which to set: if mergeAbsolute is TRUE but MERGE_DUPLICATE is requested, force a change to MERGE_ABSOLUTE. if mergeAbsolute is FALSE but MERGE_ABSOLUTE is requested, force a change to MERGE_DUPLICATE. qof_book_mergeCommit only commits entities tagged with MERGE_NEW and MERGE_UPDATE results. Entities tagged with MERGE_ABSOLUTE and MERGE_DUPLICATE results are ignored. The calling process must check the return value and call qof_book_merge_abort(mergeData) if non-zero. Parameters: mergeData  the merge context, qof_book_mergeData* tag  the result to attempt to set, qof_book_mergeResult Returns: -1 if supplied parameters are invalid or NULL, 0 on success. Definition at line 879 of file qof_book_merge.c. { qof_book_mergeRule *resolved; g_return_val_if_fail((mergeData != NULL), NULL); g_return_val_if_fail((tag > 0), NULL); g_return_val_if_fail((tag != MERGE_REPORT), NULL); resolved = mergeData->currentRule; g_return_val_if_fail((resolved != NULL), NULL); if((resolved->mergeAbsolute == TRUE)&&(tag == MERGE_DUPLICATE)) { tag = MERGE_ABSOLUTE; } if((resolved->mergeAbsolute == TRUE)&&(tag == MERGE_NEW)) { tag = MERGE_UPDATE; } if((resolved->mergeAbsolute == FALSE)&& (tag == MERGE_ABSOLUTE)) { tag = MERGE_DUPLICATE; } if((resolved->mergeResult == MERGE_NEW)&&(tag == MERGE_UPDATE)) { tag = MERGE_NEW; } if(resolved->updated == FALSE) { resolved->mergeResult = tag; } resolved->updated = TRUE; if(tag >= MERGE_INVALID) { mergeData->abort = TRUE; mergeData->currentRule = resolved; return NULL; } mergeData->currentRule = resolved; return mergeData; }

---