Attempt #3

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index 577f596ca6fd07b2b5ca47244db0900edc79ba31..96226d83ebc720b6aa640ce1becbc828b25e9284 100644 (file)
--- 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 7d85e932b371939375f6a601634d2a8408d720b4..035d6dd1e8db0a378bf60a6e63dd97ccb78934d5 100644 (file)
--- 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 3b705f088456d66d8836e545ecc899a5bcf29622..c7bd93574a0abee064f07e649cef3d4de8dd8ef7 100644 (file)
--- 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>