Software / code / prosody
Changeset
10926:c55bd98a54f8
mod_storage_internal, mod_storage_memory: Add support for query.before
Previously returned all results.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Jun 2020 16:55:35 +0100 |
| parents | 10925:73e95ecec733 |
| children | 10927:470602a8b633 |
| files | plugins/mod_storage_internal.lua plugins/mod_storage_memory.lua |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_internal.lua Fri Jun 12 16:54:38 2020 +0100 +++ b/plugins/mod_storage_internal.lua Fri Jun 12 16:55:35 2020 +0100 @@ -135,7 +135,7 @@ return function () end; end local count = nil; - local i = 0; + local i, last_key = 0; if query then items = array(items); if query.key then @@ -178,6 +178,8 @@ return nil, "item-not-found"; end end + elseif query.before then + last_key = query.before; elseif query.after then local found = false; for j = 1, #items do @@ -198,7 +200,9 @@ return function () i = i + 1; local item = items[i]; - if not item then return; end + if not item or (last_key and item.key == last_key) then + return; + end local key = item.key or tostring(i); local when = item.when or datetime.parse(item.attr.stamp); local with = item.with;
--- a/plugins/mod_storage_memory.lua Fri Jun 12 16:54:38 2020 +0100 +++ b/plugins/mod_storage_memory.lua Fri Jun 12 16:55:35 2020 +0100 @@ -101,7 +101,7 @@ return function () end; end local count = nil; - local i = 0; + local i, last_key = 0; if query then items = array():append(items); if query.key then @@ -142,6 +142,8 @@ return nil, "item-not-found"; end end + elseif query.before then + last_key = query.before; elseif query.after then local found = false; for j = 1, #items do @@ -162,7 +164,7 @@ return function () i = i + 1; local item = items[i]; - if not item then return; end + if not item or (last_key and item.key == last_key) then return; end return item.key, item.value(), item.when, item.with; end, count; end
