Skip to content
Snippets Groups Projects

Bugs 6397

Merged alexey.stratulat requested to merge bugs-6397 into release-1.1
3 files
+ 17
126
Compare changes
  • Side-by-side
  • Inline
Files
3
+ 6
37
@@ -78,45 +78,14 @@ def list_block(net, chain_name):
def list_block_offset_reverse(net, chain_name, count, page):
max_element = common.count_atom(net, chain_name)
if max_element <= count:
res = list_block_offset(net, chain_name, count, page)
if res.get('blocks', None) is None:
return res
res['blocks'] = list(reversed(res['blocks']))
return res
page_end = math.ceil(max_element / count)
if page == 1 or page == 0:
res = list_block_offset(net, chain_name, count, page_end)
if res.get('blocks', None) is None:
return res
res['blocks'] = list(reversed(res['blocks']))
if len(res['blocks']) == count or page_end - 1 < 1:
return res
else:
delta = count - len(res['blocks'])
priv_page = list_block_offset(net, chain_name, count, page_end - 1)
for i in range(len(priv_page['blocks']) - 1, len(priv_page['blocks']) - delta - 1, -1):
res['blocks'].append(priv_page['blocks'][i])
return res
else:
tpage = page_end - page
res = list_block_offset(net, chain_name, count, tpage)
if res.get('blocks', None) is None:
return res
delta = (page_end * count) - max_element
del res['blocks'][0: delta]
res['blocks'] = list(reversed(res['blocks']))
if tpage - 1 <= 1:
return res
tpage2 = list_block_offset(net, chain_name, count, tpage - 1)
del tpage2['blocks'][0:len(tpage2['blocks']) - delta]
for el in tpage2['blocks']:
res['blocks'].insert(0, el)
res = list_block_offset(net, chain_name, count, page, False)
if res.get('blocks', None) is None:
return res
res['blocks'].reverse()
return res
def list_block_offset(net, chain_name, count, page):
def list_block_offset(net, chain_name, count, page, reverse = True):
chain_net = Net.byName(net)
chain = chain_net.getChainByName(chain_name)
if chain is None:
@@ -126,7 +95,7 @@ def list_block_offset(net, chain_name, count, page):
"msg": "Failed to get chain named " + chain_name + "."
}
}
atoms = chain.getAtoms(count, page)
atoms = chain.getAtoms(count, page, reverse)
if atoms is None:
return {
"error":
Loading