mirror of
https://codeberg.org/grunfink/snac2.git
synced 2024-11-22 13:25:04 +00:00
Keep the original question order after updates.
This commit is contained in:
parent
d7b74574ad
commit
05ac2a062d
1 changed files with 21 additions and 16 deletions
|
@ -973,11 +973,10 @@ int update_question(snac *user, const char *id)
|
||||||
xs *msg = NULL;
|
xs *msg = NULL;
|
||||||
xs *rcnt = xs_dict_new();
|
xs *rcnt = xs_dict_new();
|
||||||
xs *z = xs_number_new(0);
|
xs *z = xs_number_new(0);
|
||||||
xs *chld = NULL;
|
|
||||||
xs *rcpts = xs_list_new();
|
xs *rcpts = xs_list_new();
|
||||||
|
xs *lopts = xs_list_new();
|
||||||
xs_list *opts;
|
xs_list *opts;
|
||||||
xs_val *p;
|
xs_list *p;
|
||||||
xs_str *k;
|
|
||||||
xs_val *v;
|
xs_val *v;
|
||||||
|
|
||||||
/* get the object */
|
/* get the object */
|
||||||
|
@ -997,12 +996,14 @@ int update_question(snac *user, const char *id)
|
||||||
p = opts;
|
p = opts;
|
||||||
while (xs_list_iter(&p, &v)) {
|
while (xs_list_iter(&p, &v)) {
|
||||||
const char *name = xs_dict_get(v, "name");
|
const char *name = xs_dict_get(v, "name");
|
||||||
if (name)
|
if (name) {
|
||||||
rcnt = xs_dict_set(rcnt, name, z);
|
lopts = xs_list_append(lopts, name);
|
||||||
|
rcnt = xs_dict_set(rcnt, name, z);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* iterate now the children (the votes) */
|
/* iterate now the children (the votes) */
|
||||||
chld = object_children(id);
|
xs *chld = object_children(id);
|
||||||
p = chld;
|
p = chld;
|
||||||
while (xs_list_iter(&p, &v)) {
|
while (xs_list_iter(&p, &v)) {
|
||||||
xs *obj = NULL;
|
xs *obj = NULL;
|
||||||
|
@ -1029,19 +1030,23 @@ int update_question(snac *user, const char *id)
|
||||||
|
|
||||||
/* create a new list of options with their new counts */
|
/* create a new list of options with their new counts */
|
||||||
xs *nopts = xs_list_new();
|
xs *nopts = xs_list_new();
|
||||||
p = rcnt;
|
p = lopts;
|
||||||
while (xs_dict_iter(&p, &k, &v)) {
|
while (xs_list_iter(&p, &v)) {
|
||||||
xs *d1 = xs_dict_new();
|
const xs_number *cnt = xs_dict_get(rcnt, v);
|
||||||
xs *d2 = xs_dict_new();
|
|
||||||
|
|
||||||
d2 = xs_dict_append(d2, "type", "Collection");
|
if (xs_type(cnt) == XSTYPE_NUMBER) {
|
||||||
d2 = xs_dict_append(d2, "totalItems", v);
|
xs *d1 = xs_dict_new();
|
||||||
|
xs *d2 = xs_dict_new();
|
||||||
|
|
||||||
d1 = xs_dict_append(d1, "type", "Note");
|
d2 = xs_dict_append(d2, "type", "Collection");
|
||||||
d1 = xs_dict_append(d1, "name", k);
|
d2 = xs_dict_append(d2, "totalItems", cnt);
|
||||||
d1 = xs_dict_append(d1, "replies", d2);
|
|
||||||
|
|
||||||
nopts = xs_list_append(nopts, d1);
|
d1 = xs_dict_append(d1, "type", "Note");
|
||||||
|
d1 = xs_dict_append(d1, "name", v);
|
||||||
|
d1 = xs_dict_append(d1, "replies", d2);
|
||||||
|
|
||||||
|
nopts = xs_list_append(nopts, d1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update the list */
|
/* update the list */
|
||||||
|
|
Loading…
Reference in a new issue