Sorting logfiles. Small modifications so that header is not inside the table of listed files.v2.0_alpha2

git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@387 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 7 insertions, 7 deletions

diff --git a/logfiles-model.lua b/logfiles-model.lua
index 39a3e4f..e0e0888 100644
--- a/logfiles-model.lua
+++ b/logfiles-model.lua
@@ -46,9 +46,7 @@ end
 
 -- Function to list available files for view/delete
 local function list_files ( ... )
-	-- Create a header for the view and create variables
-	local listed_files = { cfe{inuse="Delete", save="Save", view="View", 
-			size="Size", lastmod="Last Modified", name="File"} }
+	local listed_files = {}
 	local open_files = {}
 	local files = {}
 	local k,v
@@ -60,15 +58,17 @@ local function list_files ( ... )
 	for k,v in pairs(files) do
 		-- Get info on this specific file and put it in a table
 		local lastmod,size,fileinuseresult,fileinuseurl = file_info(v)
-		table.insert ( listed_files , cfe{inuse=fileinuseresult, del=fileinuseurl, save="/download?name=" .. v, view="/view?name=" .. v, size=size, lastmod=lastmod, name=v, type="", id=k} )
+		table.insert ( listed_files , cfe{inuse=fileinuseresult, del=fileinuseurl, save="/download?name=" .. v, 
+			view="/view?name=" .. v, size=size, lastmod=lastmod, name=v, type="", id=k} )
 	end
+	table.sort(listed_files, function (a,b) return (a.name < b.name) end )
 	return listed_files
 end
 
 -- Function to check if a file is deletable, and if it is, then delete it.
 local function checkfilefordelete ( filetodelete )
 	local deletedfile = {}
-	deletedfile = cfe{value=nil, type="text", option=nil, errtxt="File '" .. filetodelete .. "' has not been deleted!"}
+	deletedfile = {value=nil, type="text", option=nil, errtxt="File '" .. filetodelete .. "' has not been deleted!"}
 	-- Get a list of files that could be deleted
 	local available_files = get()
 	for k,v in pairs(available_files) do
@@ -77,9 +77,9 @@ local function checkfilefordelete ( filetodelete )
 			if ( available_files[k].del ) then
 				local status, err = os.remove( filetodelete )
 				if not ( err ) then
-					deletedfile = cfe{value="File '" .. filetodelete .. "' has been successfully deleted!", type="text", option=nil, errtxt=err}
+					deletedfile = {value="File '" .. filetodelete .. "' has been successfully deleted!", type="text"}
 				else
-					deletedfile = cfe{value=nil, type="text", option=nil, errtxt=err}
+					deletedfile = {value=nil, type="text", option=nil, errtxt=err}
 				end
 			else
 			end