webmcp

diff framework/env/request/default_router.lua @ 221:25a20bd1f416

More work on Moonbridge integration: several changes in env/request
author jbe
date Wed Feb 25 01:33:27 2015 +0100 (2015-02-25)
parents fd0360594636
children 4ab91adeab6f
line diff
     1.1 --- a/framework/env/request/default_router.lua	Sun Feb 22 17:16:13 2015 +0100
     1.2 +++ b/framework/env/request/default_router.lua	Wed Feb 25 01:33:27 2015 +0100
     1.3 @@ -12,25 +12,22 @@
     1.4    if not path then
     1.5      return nil
     1.6    end
     1.7 -  if not string.match(path, "^/") then
     1.8 -    path = "/" .. path
     1.9 -  end
    1.10 -  if path == "/" then
    1.11 +  if path == "" then
    1.12      return {module = "index", view = "index"}
    1.13    end
    1.14 -  module = string.match(path, "^/([^/]+)/$")
    1.15 +  module = string.match(path, "^([^/]+)/$")
    1.16    if module then
    1.17      return {module = module, view = "index"}
    1.18    end
    1.19 -  module, action = string.match(path, "^/([^/]+)/([^/.]+)$")
    1.20 +  module, action = string.match(path, "^([^/]+)/([^/.]+)$")
    1.21    if module then
    1.22      return {module = module, action = action}
    1.23    end
    1.24 -  module, view, suffix = string.match(path, "^/([^/]+)/([^/.]+)%.([^/]+)$")
    1.25 +  module, view, suffix = string.match(path, "^([^/]+)/([^/.]+)%.([^/]+)$")
    1.26    if module then
    1.27      return {module = module, view = view, suffix = suffix}
    1.28    end
    1.29 -  module, view, id, suffix = string.match(path, "^/([^/]+)/([^/]+)/([^/.]+)%.([^/]+)$")
    1.30 +  module, view, id, suffix = string.match(path, "^([^/]+)/([^/]+)/([^/.]+)%.([^/]+)$")
    1.31    if module then
    1.32      return {module = module, view = view, id = id, suffix = suffix}
    1.33    end

Impressum / About Us