* Core translation part 1

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

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 6a6bceb..e9d3b24 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
 
@@ -131,13 +128,14 @@ function dispatch()
        tpl.viewns.media      = luci.config.main.mediaurlbase
        tpl.viewns.resource   = luci.config.main.resourcebase
        
-       -- Load default translation
-       require("luci.i18n").loadc("default")
-       
 
        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)
@@ -153,11 +151,13 @@ function createindex()
        local path = luci.sys.libpath() .. "/controller/"
        local suff = ".lua"
        
-       if pcall(require, "fastindex") then
+       --[[if pcall(require, "fastindex") then
                createindex_fastindex(path, suff)
        else
                createindex_plain(path, suff)
-       end
+       end]]--
+       
+       createindex_plain(path, suff)
        
        built_index = true
 end
@@ -219,16 +219,28 @@ function createtree()
        if not built_index then
                createindex()
        end
+       
+       require("luci.i18n")
+               
+       -- Load default translation
+       luci.i18n.loadc("default")
+       
+       local scope = _G
+       for k,v in pairs(_M) do
+               if type(v) == "function" then
+                       scope[k] = v
+               end
+       end
 
        for k, v in pairs(index) do
-               luci.util.updfenv(v, _M)
+               scope._NAME = k
+               setfenv(v, scope)
                
-               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 +254,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 +273,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 +291,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