From 94a0a302dab75c3a901c736a47b93b614d5e83d1 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 30 Dec 2015 13:38:14 +0000
Subject: Change logfiles filesize to size, size and mtime not user-friendly,
 use posix.stat over fs.stat, use new format functions

---
 logfiles-status-html.lsp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'logfiles-status-html.lsp')

diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp
index e85a9ba..688d975 100644
--- a/logfiles-status-html.lsp
+++ b/logfiles-status-html.lsp
@@ -2,20 +2,6 @@
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 <% html = require("acf.html") %>
 
-<%
-function convertsize(size)
-	if string.find(size, "k$") then
-		return tonumber(string.match(size, "[%d.]*")) * 1024.0
-	elseif string.find(size, "M$") then
-		return tonumber(string.match(size, "[%d.]*")) * 1024.0 * 1024.0
-	elseif string.find(size, "G$") then
-		return tonumber(string.match(size, "[%d.]*")) + 1024.0 * 1024.0 * 1024.0
-	else
-		return tonumber(string.match(size, "[%d.]*"))
-	end
-end
-%>
-
 <script type="text/javascript">
         if (typeof jQuery == 'undefined') {
 		document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
@@ -71,8 +57,8 @@ end
 		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="View", action="view" }), page_info, -1) %></td>
 		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="Tail", action="tail" }), page_info, -1) %></td>
 		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, viewtype=viewtype}, label="", option="Download", action="download" }), page_info, -1) %></td>
-		<td><span class="hide"><%= convertsize(file.value.filesize.value) %>b</span><%= html.html_escape(file.value.filesize.value) %></td>
-		<td><%= html.html_escape(file.value.mtime.value) %></td>
+		<td><span class="hide"><%= html.html_escape(file.value.size.value) %>b</span><%= format.formatfilesize(file.value.size.value) %></td>
+		<td><%= format.formattime(file.value.mtime.value) %></td>
 		<td><%= html.html_escape(file.value.filename.value) %></td>
 	</tr>
 <% end %>
-- 
cgit v1.2.3