diff options
| author | Steven Barth <steven@midlink.org> | 2008-08-17 20:54:26 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-08-17 20:54:26 +0000 |
| commit | 385c63d4fb5f890ebf23223c7e791f7ee5a9aec7 (patch) | |
| tree | 64eb67a92f0eb878935238f47be0c9f7cbc3de09 /applications | |
| parent | b0144108a8affb16ed7731608c110a70aac044db (diff) | |
Attempt #3
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-olsr/luasrc/controller/olsr.lua | 6 | ||||
| -rw-r--r-- | applications/luci-olsr/luasrc/view/status-olsr/index.htm | 3 | ||||
| -rw-r--r-- | applications/luci-olsr/luasrc/view/status-olsr/topology.htm | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua index 577f596ca6..96226d83eb 100644 --- a/applications/luci-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-olsr/luasrc/controller/olsr.lua @@ -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 diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm index 7d85e932b3..035d6dd1e8 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm @@ -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 diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm index 3b705f0884..c7bd93574a 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm @@ -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> |