* libs/web: Added .leaf attribute to dispatching tree to stop dispatching at a certai...

[project/luci.git] / libs / web / luasrc / dispatcher.lua

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 6a6bceb..d1fcdcd 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -34,9 +34,6 @@ local tree = {nodes={}}
 -- Index table
 local index = {}
 
--- Indexdump
-local indexcache = "/tmp/.luciindex"
-
 -- Global request object
 request = {}
 
@@ -83,7 +80,7 @@ function httpdispatch()
        local pathinfo = luci.http.env.PATH_INFO or ""
        local c = tree
 
-       for s in pathinfo:gmatch("([%w_]+)") do
+       for s in pathinfo:gmatch("([%w-]+)") do
                table.insert(request, s)
        end
 
@@ -101,7 +98,7 @@ function dispatch()
 
        for i, s in ipairs(request) do
                c = c.nodes[s]
-               if not c then
+               if not c or c.leaf then
                        break
                end
 
@@ -137,7 +134,11 @@ function dispatch()
 
        if c and type(c.target) == "function" then
                dispatched = c
-
+               stat, mod = pcall(require, c.module)
+               if stat then
+                       luci.util.updfenv(c.target, mod)
+               end
+               
                stat, err = pcall(c.target)
                if not stat then
                        error500(err)
@@ -219,16 +220,18 @@ function createtree()
        if not built_index then
                createindex()
        end
+       
+       require("luci.i18n")
 
        for k, v in pairs(index) do
                luci.util.updfenv(v, _M)
+               luci.util.extfenv(v, "_NAME", k)
                
-               local stat, mod = pcall(require, k)
-               if stat then            
-                       luci.util.updfenv(v, mod)
+               local stat, err = pcall(v)
+               if not stat then
+                       error500(err)   
+                       os.exit(1)
                end
-               
-               pcall(v)
        end
        
        built_tree = true
@@ -242,6 +245,7 @@ function entry(path, target, title, order, add)
        c.target = target
        c.title  = title
        c.order  = order
+       c.module = getfenv(2)._NAME
 
        for k,v in pairs(add) do
                c[k] = v
@@ -260,7 +264,7 @@ function node(...)
 
        for k,v in ipairs(arg) do
                if not c.nodes[v] then
-                       c.nodes[v] = {nodes={}}
+                       c.nodes[v] = {nodes={}, module=getfenv(2)._NAME}
                end
 
                c = c.nodes[v]
@@ -278,6 +282,25 @@ function alias(...)
        end
 end
 
+function rewrite(n, ...)
+       local req = arg
+       return function()
+               for i=1,n do 
+                       table.remove(request, 1)
+               end
+               
+               for i,r in ipairs(req) do
+                       table.insert(request, i, r)
+               end
+               
+               dispatch()
+       end
+end
+
+function call(name)
+       return function() getfenv()[name]() end
+end
+
 function template(name)
        require("luci.template")
        return function() luci.template.render(name) end