From eda53d1d4130965b5d49edb3d27ebe5f1a4c420f Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 18 Apr 2012 01:34:55 +0000
Subject: Started work on updating for acf-core-0.15

Removed controllerfunctions library (still needs more work and corresponding work in model)
Updated for viewfunctions to htmlviewfunctions
---
 postgresql-controller.lua     | 7 ++-----
 postgresql-details-html.lsp   | 4 ++--
 postgresql-listfiles-html.lsp | 4 ++--
 postgresql-logfile-html.lsp   | 1 -
 postgresql-model.lua          | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/postgresql-controller.lua b/postgresql-controller.lua
index 83f2a05..c1af2c5 100644
--- a/postgresql-controller.lua
+++ b/postgresql-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 mvc = {}
 mvc.on_load = function(self, parent)
 	self.model.set_processname(string.match(self.conf.prefix, "[^/]+"))
@@ -15,7 +12,7 @@ function status(self)
 end
 
 function startstop(self)
-	return controllerfunctions.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
+	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
 
 function details(self)
@@ -27,5 +24,5 @@ function listfiles(self)
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit Postgresql File", "File Saved")
+	return self.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit Postgresql File", "File Saved")
 end
diff --git a/postgresql-details-html.lsp b/postgresql-details-html.lsp
index 8f1363e..ae142cd 100644
--- a/postgresql-details-html.lsp
+++ b/postgresql-details-html.lsp
@@ -1,5 +1,5 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <% viewlibrary.dispatch_component("status") %>
@@ -7,6 +7,6 @@ require("viewfunctions")
 <H2><%= html.html_escape(data.label) %></H2>
 <DL>
 <%
-displayitem(data)
+htmlviewfunctions.displayitem(data)
 %>
 </DL>
diff --git a/postgresql-listfiles-html.lsp b/postgresql-listfiles-html.lsp
index 2437393..9d8d6aa 100644
--- a/postgresql-listfiles-html.lsp
+++ b/postgresql-listfiles-html.lsp
@@ -1,8 +1,8 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"expert"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"expert"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/postgresql-logfile-html.lsp b/postgresql-logfile-html.lsp
index 4f2e388..ab18bf4 100644
--- a/postgresql-logfile-html.lsp
+++ b/postgresql-logfile-html.lsp
@@ -1,5 +1,4 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
diff --git a/postgresql-model.lua b/postgresql-model.lua
index 690802d..6a4d188 100644
--- a/postgresql-model.lua
+++ b/postgresql-model.lua
@@ -34,7 +34,7 @@ end
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-function get_startstop(clientdata)
+function get_startstop(clientdata)       
 	return modelfunctions.get_startstop(processname)
 end
 
-- 
cgit v1.2.3