Changeset 6744

Timestamp:

01/15/11 20:13:19 (2 years ago)

Author:

soma

Message:

modules/freifunk: When olsrd was loaded but there were no neighbors then the page for services was showing an error.

Files:

• luci/trunk/modules/freifunk/luasrc/view/freifunk-services/services.htm (modified) (5 diffs)

luci/trunk/modules/freifunk/luasrc/view/freifunk-services/services.htm

@@ -2 +2 @@
 
 <%
-require("luci.fs")
-require("luci.util")
+local fs  = require "luci.fs"
+local utl = require "luci.util"
 
 -- check if nameservice plugin is enabled and where to find the services file
 local has_services = false
+
 local uci = require "luci.model.uci".cursor()
 uci:foreach("olsrd", "LoadPlugin", function(s)
     if s.library == "olsrd_nameservice.so.0.3" then
-        if s.services_file then
+        if s.services_file and fs.access(s.services_file) then
             has_services = true
             services_file = s.services_file
         else
-            has_services = true
-            services_file = "/var/run/services_olsr"
+            if fs.access("/var/run/services_olsr") then
+                has_services = true
+                services_file = "/var/run/services_olsr"
+            end
         end
     end
@@ -22 +25 @@
 
 function fetch_services()
-    local rawdata = luci.fs.readfile(services_file)
+    local rawdata = fs.readfile(services_file)
 
     if #rawdata == 0 then
@@ -30 +33 @@
     local data = {}
 
-    local tables = luci.util.split(luci.util.trim(rawdata), "\n", nil, true)
+    local tables = utl.split(utl.trim(rawdata), "\n", nil, true)
     -- remove the first 3 lines
     table.remove(tables,1)
@@ -41 +44 @@
 
     for i, tbl in ipairs(tables) do
-        local lines = luci.util.split(tbl, "\n", nil, true)
+        local lines = utl.split(tbl, "\n", nil, true)
     end
     
@@ -65 +68 @@
         local field = {}
         -- split line at # and |, 1=url, 2=proto, 3=description, 4=source
-        local field = luci.util.split(line, "[#|]", split, true)
+        local field = utl.split(line, "[#|]", split, true)
         local url,descr,origin = pcdata(field[1]),pcdata(field[3]),pcdata(field[4])
         %>