vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implements class Paginator to better handle results

Browse source 
A new Paginator class has been implemented. The class
is generic in the sense that it accepts lua tables as input
in order to cofigure, for exampe, the number of results per page
and so on.
This commit is contained in:
Simone Mainardi 2016-06-09 00:23:25 +02:00
parent 63879f9635
commit 5048f0d9af
11 changed files with 382 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
scripts/lua/get_flows_data.lua
View file

@ -46,20 +46,20 @@ if(network_id ~= nil) then
network_id = tonumber(network_id)
end
if((sortColumn == nil) or (sortColumn == "column_"))then
sortColumn = getDefaultTableSort("flows")
else
if((sortColumn ~= "column_") and (sortColumn ~= "")) then
if sortColumn == nil or sortColumn == "column_" or sortColumn == "" then
sortColumn = getDefaultTableSort("flows")
elseif sortColumn ~= "column_" and sortColumn ~= "" then
tablePreferences("sort_flows",sortColumn)
end
else
sortColumn = "column_client"
end
if(sortOrder == nil) then
if sortOrder == nil then
sortOrder = getDefaultTableSortOrder("flows")
elseif sortColumn ~= "column_" and sortColumn ~= "" then
tablePreferences("sort_order_flows",sortOrder)
else
if((sortColumn ~= "column_") and (sortColumn ~= "")) then
tablePreferences("sort_order_flows",sortOrder)
end
sortOrder = true
end
if(currentPage == nil) then
@ -84,11 +84,22 @@ if(all ~= nil) then
currentPage = 0
end
--io.write("->"..sortColumn.."/"..perPage.."/"..sortOrder.."\n")
-- io.write("->"..sortColumn.."/"..perPage.."/"..sortOrder.."/"..sortColumn.."\n")
interface.select(ifname)
if(sortOrder == "desc") then sOrder = false else sOrder = true end
res = interface.getFlowsInfo(host, application, sortColumn, perPage, to_skip, sOrder)
-- res = interface.getFlowsInfo(host, application, sortColumn, perPage, to_skip, sOrder)
local paginfo = {
["sortColumn"]=sortColumn, ["toSkip"]=to_skip, ["maxHits"]=perPage,
["a2zSortOrder"]=sOrder,
["hostFilter"]=host,
["portFilter"]=port
}
if application ~= nil and application ~= "" then
paginfo["l7protoFilter"]=interface.getnDPIProtoId(application)
end
res = interface.getFlowsInfo(host, paginfo)
flows_stats,total = aggregateFlowsStats(res)
print ("{ \"currentPage\" : " .. currentPage .. ",\n \"data\" : [\n")