From 2678d43e1f155b2b692c729bb0470967072a8d58 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 28 Dec 2009 10:32:40 +0000 Subject: Removed redundant/buggy basename and dirname functions. Added parse_redir_string to www controller. Removed basename and dirname from mvc and fs, use posix functions instead. parse_path_info was buggy and used 2 ways, rewrote and created parse_redir_string for backwards parsing. --- lib/menubuilder.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/menubuilder.lua') diff --git a/lib/menubuilder.lua b/lib/menubuilder.lua index 8c93795..51ed76d 100644 --- a/lib/menubuilder.lua +++ b/lib/menubuilder.lua @@ -5,6 +5,7 @@ ]]-- module(..., package.seeall) +require("posix") require("format") -- returns a table of the "*.menu" tables @@ -63,8 +64,8 @@ get_menuitems = function (startdir) local reversecats = {} startdir = (string.gsub(startdir, "/$", "")) --remove trailing / for k,filename in pairs(get_candidates(startdir)) do - local controller = mvc.basename(filename, ".menu") - local prefix = (string.gsub(mvc.dirname(filename), startdir, "")).."/" + local controller = string.gsub(posix.basename(filename), ".menu$", "") + local prefix = (string.gsub(posix.dirname(filename), startdir, "")).."/" -- open the menu file, and parse the contents local handle = io.open(filename) -- cgit v1.2.3