Cleaning up the code.

git-svn-id: svn://svn.alpinelinux.org/acf/devtools/trunk@967 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 38 insertions, 27 deletions

diff --git a/acfupdate-controller.lua b/acfupdate-controller.lua
index 65c3f60..def2ba7 100644
--- a/acfupdate-controller.lua
+++ b/acfupdate-controller.lua
@@ -1,40 +1,51 @@
 module (..., package.seeall)
 
--- Cause an http redirect to our "read" action
--- We use the self.conf table because it already has prefix,controller,etc
--- The redir code is defined in the application error handler (acf-controller)
-local list_redir = function (self)
+-- ################################################################################
+-- LOCAL FUNCTIONS
+
+local function list_redir (self)
 	self.conf.action = "read"
 	self.conf.type = "redir"
 	error (self.conf)
 end
 
+-- ################################################################################
+-- PUBLIC FUNCTIONS
+
 mvc={}
-mvc.on_load = function(self, parent)
+function mvc.on_load(self, parent)
 	if (self.worker[self.conf.action] == nil ) or ( self.conf.action == "init" ) then
 		self.worker[self.conf.action] = list_redir(self)
 	end
 end
 
--- Public methods
 
-read = function (self )
-	return ({projects = self.model:get(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+function read (self )
+	return ({projects = self.model:get(), 
+		url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end
 
-update = function (self )
-	return ({projects = self.model:get(),updates = self.model:update(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+function update (self )
+	return ({projects = self.model:get(),
+		updates = self.model:update(), 
+		url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end
 
-diff = function (self )
-	return ({projects = self.model:get(),updates = self.model:diffs(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+function diff (self )
+	return ({projects = self.model:get(),
+		updates = self.model:diffs(), 
+		url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end
 
-status = function (self )
-	return ({projects = self.model:get(),updates = self.model:status(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+function status (self )
+	return ({projects = self.model:get(),
+		updates = self.model:status(), 
+		url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end
 
-log = function (self )
-	return ({projects = self.model:get(),updates = self.model:log(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+function log (self )
+	return ({projects = self.model:get(),
+		updates = self.model:log(), 
+		url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end
 
diff --git a/acfupdate-model.lua b/acfupdate-model.lua
index 39a39ca..9ead481 100644
--- a/acfupdate-model.lua
+++ b/acfupdate-model.lua
@@ -1,12 +1,12 @@
--- acf model for displaying logfiles recusivly 
 module (..., package.seeall)
 
+-- Load libraries
 require("fs")
 require("format")
--- no initializer in model - use controller.init for that
 
--- ###############################################################
--- Private functions
+-- ################################################################################
+-- LOCAL FUNCTIONS
+
 local function querycmd ( cmdline )
 	local cmd = io.popen( cmdline )
 	local cmd_result = cmd:read("*a") or "unknown"
@@ -14,15 +14,15 @@ local function querycmd ( cmdline )
 	return cmd_result
 end
 
--- ###############################################################
--- Public functions
+-- ################################################################################
+-- PUBLIC FUNCTIONS
 
-get = function (self)
+function get (self)
 	local svnurl = "svn://svn.alpinelinux.org/acf/"
 	return querycmd("/usr/bin/svn list -v " .. svnurl )
 end
 
-update = function (self)
+function update (self)
 	local svnurl = "svn://svn.alpinelinux.org/acf/"
 	local updates = {}
 	local cmdresult = {}
@@ -44,7 +44,7 @@ update = function (self)
 	return updates
 end
 
-diffs = function (self)
+function diffs (self)
 	local svnurl = "svn://svn.alpinelinux.org/acf/"
 	local updates = {}
 	local cmdresult = {}
@@ -66,7 +66,7 @@ diffs = function (self)
 	return updates
 end
 
-status = function (self)
+function status (self)
 	local svnurl = "svn://svn.alpinelinux.org/acf/"
 	local updates = {}
 	local cmdresult = {}
@@ -85,7 +85,7 @@ status = function (self)
 	updates.cmdresult = cmdresult
 	return updates
 end
-log = function (self)
+function log (self)
 	local svnurl = "svn://svn.alpinelinux.org/acf/"
 	local updates = {}
 	local cmdresult = {}