From: Steven Barth <steven@midlink.org>
Date: Sun, 17 Aug 2008 20:54:26 +0000 (+0000)
Subject: Attempt #3
X-Git-Tag: 0.8.0~378
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=385c63d4fb5f890ebf23223c7e791f7ee5a9aec7

Attempt #3
---

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index 577f596ca..96226d83e 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 7d85e932b..035d6dd1e 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 3b705f088..c7bd93574 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>