From 7947f17ad4ba8e0b3c41a9ace736e005c66017c2 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 2 Jul 2008 20:24:35 +0000 Subject: Changed logfiles to use controllerfunctions and standard html-lsp files. git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1270 ab2d0c66-481e-0410-8bed-d214d4d58bed --- logfiles-controller.lua | 16 ++-------------- logfiles-model.lua | 12 ++++++++---- logfiles-status-html.lsp | 9 ++++----- logfiles-view-html.lsp | 21 +-------------------- 4 files changed, 15 insertions(+), 43 deletions(-) mode change 100644 => 120000 logfiles-view-html.lsp diff --git a/logfiles-controller.lua b/logfiles-controller.lua index 400756e..dc22115 100644 --- a/logfiles-controller.lua +++ b/logfiles-controller.lua @@ -9,23 +9,11 @@ status = function (self ) end delete = function (self) - local filetodelete = self.clientdata.name or "" - local deletestatus = self.model.delete(filetodelete) - if (deletestatus.errtxt) then - return deletestatus - else - redirect(self) - end + return self:redirect_to_referrer(self.model.delete(self.clientdata.name or "")) end view = function (self) - local filetoview = self.clientdata.name or "" - local content = self.model.get_filedetails(filetoview) - if (filetoview ~= "") and content then - return content - else - redirect(self) - end + return self.model.get_filedetails(self.clientdata.name or "") end download = function (self) diff --git a/logfiles-model.lua b/logfiles-model.lua index 6ef6a1d..2ac4f5d 100644 --- a/logfiles-model.lua +++ b/logfiles-model.lua @@ -1,13 +1,14 @@ -- acf model for displaying logfiles module (..., package.seeall) require("fs") +require("modelfunctions") -- Function to get detailed information on a specific file. local function file_info ( path ) -- Check if file is in use local st = fs.stat(path) - local size = st.size - local lastmod = st.mtime + local size = st.size or "0" + local lastmod = st.mtime or "---" local file_inuse = io.popen("fuser " .. path ) local fileinuseresult = file_inuse:read("*a") or "unknown" file_inuse:close() @@ -64,11 +65,14 @@ get_filedetails = function (path) local available_files = get() for i,file in ipairs(available_files.value) do if ( file.value.filename.value == path ) then - filedetails = file - filedetails.value.filecontent = cfe({ type="longtext", value=fs.read_file(path), label="File content" }) + filedetails = modelfunctions.getfiledetails(path) break end end + if not filedetails then + filedetails = modelfunctions.getfiledetails("") + filedetails.value.filename.value = path + end return filedetails end diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp index 8ba5113..d7cbe6c 100644 --- a/logfiles-status-html.lsp +++ b/logfiles-status-html.lsp @@ -1,7 +1,8 @@ - + + + + - -

Available Logfiles

@@ -30,5 +31,3 @@

- - diff --git a/logfiles-view-html.lsp b/logfiles-view-html.lsp deleted file mode 100644 index 4d30f14..0000000 --- a/logfiles-view-html.lsp +++ /dev/null @@ -1,20 +0,0 @@ - - -

LOGFILE

- -

Details

- -

File name
File size
Last modified

- -

Content

- - diff --git a/logfiles-view-html.lsp b/logfiles-view-html.lsp new file mode 120000 index 0000000..15b1930 --- /dev/null +++ b/logfiles-view-html.lsp @@ -0,0 +1 @@ +../filedetails-html.lsp \ No newline at end of file -- cgit v1.2.3