This commit is contained in:
Steven Barth 2008-08-17 20:54:26 +00:00
parent b0144108a8
commit 385c63d4fb
3 changed files with 3 additions and 9 deletions

View file

@ -156,11 +156,11 @@ function fetch_txtinfo(otable)
local data = {}
local tables = luci.util.split(luci.util.trim(rawdata), "\n\n")
local tables = luci.util.split(luci.util.trim(rawdata), "\r?\n\r?\n", nil, true)
for i, tbl in ipairs(tables) do
local lines = luci.util.split(tbl, "\n")
local lines = luci.util.split(tbl, "\r?\n", nil, true)
local name = table.remove(lines, 1):sub(8)
local keys = luci.util.split(table.remove(lines, 1), "\t")
local split = #keys - 1
@ -178,7 +178,7 @@ function fetch_txtinfo(otable)
data[name][j].LinkQuality,
data[name][j].NLQ,
data[name][j].ETX =
data[name][j].Linkcost:match("(.*)/(.*)\t(.*)")
data[name][j].Linkcost:match("([%w.]+)/([%w.]+)[%s]+([%w.]+)")
end
end
end

View file

@ -25,9 +25,6 @@ $Id$
<th>ETX</th>
</tr>
<% for k, link in ipairs(links) do
if link.Linkcost then
link.LinkQuality, link.NLQ, link.ETX = link.Linkcost:match("(.*)/(.*)\t(.*)")
end
local color = "#bb3333"
link.ETX = tonumber(link.ETX) or 0

View file

@ -24,9 +24,6 @@ $Id$
<th>ETX</th>
</tr>
<% for k, route in ipairs(routes) do
if route.Linkcost then
route.LQ, route.ILQ, route.ETX = route.Linkcost:match("(.*)/(.*)\t(.*)")
end
%>
<tr>
<td><a href="http://<%=route["Destination IP"]%>"><%=route["Destination IP"]%></a></td>