Changed datastore modstate to be last in file, as prior to 7.0

This commit is contained in:
Olof hagsand 2024-05-08 11:21:10 +02:00
parent b1209aac67
commit 8ebfdb8168
5 changed files with 15 additions and 3 deletions

View file

@ -278,7 +278,6 @@ xmldb_disconnect(clixon_handle h)
return retval;
}
/*! Copy datastore from db1 to db2
*
* May include copying datastore directory structure

View file

@ -1482,8 +1482,18 @@ xmldb_dump(clixon_handle h,
if ((xm = clicon_modst_cache_get(h, 1)) != NULL){
if ((xmodst = xml_dup(xm)) == NULL)
goto done;
/* There are two views on where to insert modstate in config: first or last
* Request from user for last
*/
#if 1
/* This is inserted last in config */
if (xml_addsub(xt, xmodst) < 0)
goto done;
#else
/* This is inserted first in config */
if (xml_child_insert_pos(xt, xmodst, 0) < 0)
goto done;
#endif
xml_parent_set(xmodst, xt);
}
switch (format){

View file

@ -926,7 +926,7 @@ xml_child_order(cxobj *xp,
* Further, never manipulate the child-list during operation or using the
* same object recursively, the function uses an internal field to remember the
* index used. It works as long as the same object is not iterated concurrently.
* If you need to delete a node you can do somethhing like:
* If you need to delete a node you can do something like:
* @code
* cxobj *xprev = NULL;
* cxobj *x = NULL;