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 and modified require statements for acf libraries

12 files changed, 24 insertions, 31 deletions

diff --git a/did-assigndefinition-ajax.lsp b/did-assigndefinition-ajax.lsp
index 1a06cc5..e8d176e 100644
--- a/did-assigndefinition-ajax.lsp
+++ b/did-assigndefinition-ajax.lsp
@@ -1,7 +1,6 @@
 <% local view, viewlibrary, page_info = ... %>
 <%
 	require("json")
-	require("html")
 %>
 Status: 200 OK
 Content-Type: "application/json"
diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp
index 14ff279..b90c6e9 100644
--- a/did-assigndefinition-html.lsp
+++ b/did-assigndefinition-html.lsp
@@ -1,5 +1,4 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
 
 <link rel="stylesheet" type="text/css" href="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.autocomplete.css">
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
diff --git a/did-controller.lua b/did-controller.lua
index 2ff5da3..a3ffd9d 100644
--- a/did-controller.lua
+++ b/did-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 default_action = "viewrecords"
 
 function listuseddefinitions(self)
@@ -36,7 +33,7 @@ local function handle_form(self, getFunction, setFunction, clientdata, option, l
 	local form = getFunction()
 
 	if clientdata["Save"] or clientdata["Test"] then
-		controllerfunctions.handle_clientdata(form, clientdata)
+		self.handle_clientdata(form, clientdata)
 
 		if clientdata["Test"] then
 			form = setFunction(form, true)
@@ -86,11 +83,11 @@ end
 
 function assigndefinition(self)
 	self.conf.viewtype = self.clientdata.viewtype or self.conf.viewtype
-	return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid, self.clientdata.did) end, function(value) return self.model.updatedefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Save", "Assign DID Number")
+	return self.handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid, self.clientdata.did) end, function(value) return self.model.updatedefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Save", "Assign DID Number")
 end
 
 function newdefinition(self)
-	local retval = controllerfunctions.handle_form(self, self.model.getunuseddefinition, function(value) return self.model.setunuseddefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Select", "Create New DID Number")
+	local retval = self.handle_form(self, self.model.getunuseddefinition, function(value) return self.model.setunuseddefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Select", "Create New DID Number")
 	if retval.value.did and not retval.errtxt then
 		-- Successfully found an unused did, redirect to edit it
 		self:redirect("editdefinition?did="..retval.value.did.value.."&redir=listdefinitions")
@@ -115,7 +112,7 @@ function status(self)
 end
 
 function createdatabase(self)
-	return controllerfunctions.handle_form(self, self.model.getnewdatabase, self.model.create_database, self.clientdata, "Create", "Create New Database", "Database Created")
+	return self.handle_form(self, self.model.getnewdatabase, self.model.create_database, self.clientdata, "Create", "Create New Database", "Database Created")
 end
 
 function viewactivitylog(self)
@@ -127,7 +124,7 @@ function listpermissions(self)
 end
 
 function edituserpermissions(self)
-	return controllerfunctions.handle_form(self, function()
+	return self.handle_form(self, function()
 			return self.model:getuserpermissions(self.clientdata.userid)
 		end, function(value)
 			return self.model:setuserpermissions(value)
@@ -135,7 +132,7 @@ function edituserpermissions(self)
 end
 
 function editrolepermissions(self)
-	return controllerfunctions.handle_form(self, function()
+	return self.handle_form(self, function()
 			return self.model:getrolepermissions(self.clientdata.role)
 		end, function(value)
 			return self.model:setrolepermissions(value)
diff --git a/did-createdatabase-html.lsp b/did-createdatabase-html.lsp
index 5110adc..372a98d 100644
--- a/did-createdatabase-html.lsp
+++ b/did-createdatabase-html.lsp
@@ -1,10 +1,10 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <% 
 	form.value.password.type = "password"
 	form.value.password_confirm.type = "password"
 	local order = { "password", "password_confirm" }
-	displayform(form, order, nil, page_info)
+	htmlviewfunctions.displayform(form, order, nil, page_info)
 %>
diff --git a/did-editdefinition-html.lsp b/did-editdefinition-html.lsp
index f88de04..434d8f2 100644
--- a/did-editdefinition-html.lsp
+++ b/did-editdefinition-html.lsp
@@ -1,6 +1,6 @@
 <% local form, viewlibrary, page_info, session = ... 
-require("viewfunctions")
-require("format")
+require("htmlviewfunctions")
+format = require("acf.format")
 require("json")
 %>
 
@@ -132,7 +132,7 @@ else %>
 <% end %>
 
 <H1><%= html.html_escape(form.label) %></H1>
-<% displayformstart(form, page_info) %>
+<% htmlviewfunctions.displayformstart(form, page_info) %>
 <%
 	local order = {"did", "description", "identification", "department", "rules", "lastchange", "available", "type"}
 	if page_info.action ~= "createdefinition" then
@@ -152,7 +152,7 @@ else %>
 		form.value.type.type = "hidden"
 	end
 	for i,name in ipairs(order) do
-		displayformitem(form.value[name], name)
+		htmlviewfunctions.displayformitem(form.value[name], name)
 	end
 %>
 </DL>
@@ -169,4 +169,4 @@ else %>
 <DT></DT><DD><input class="submit" type="submit" name="Test" value="Test"></DD>
 <DT></DT><DD><input class="submit" type="submit" name="Cancel" value="Cancel"></DD>
 <% end %>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
diff --git a/did-edituserpermissions-html.lsp b/did-edituserpermissions-html.lsp
index a135d3b..b900ea4 100644
--- a/did-edituserpermissions-html.lsp
+++ b/did-edituserpermissions-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <H1><%= html.html_escape(form.label) %></H1>
@@ -8,5 +8,5 @@ require("viewfunctions")
 	if form.value.userid then form.value.userid.readonly = true end
 	if form.value.role then form.value.role.readonly = true end
 	local order = { "userid", "role" }
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/did-html.lsp b/did-html.lsp
index b3aab67..15d0746 100644
--- a/did-html.lsp
+++ b/did-html.lsp
@@ -1,5 +1,5 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <% local subdata = data.value.definitions.value %>
@@ -22,7 +22,7 @@ end %>
 </DL>
 <% end %>
 
-<% displaycommandresults({"editdefinition", "editdefinitionextension", "deletedefinition", "publish", "publishall", "requestdid"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"editdefinition", "editdefinitionextension", "deletedefinition", "publish", "publishall", "requestdid"}, session) %>
 
 <% if data.value.did.value ~= "" or (data.value.extension and data.value.extension.value ~= "") or data.value.description.value ~= "" or data.value.identification.value ~= "" or data.value.department.value ~= "" then %>
 <H2>Search Description</H2>
@@ -51,7 +51,7 @@ end
 
 <H1><%= html.html_escape(data.label) %></H1>
 <DL>
-<% displaypagination(pagedata, page_info) %>
+<% htmlviewfunctions.displaypagination(pagedata, page_info) %>
 <TABLE>
 	<TR style="background:#eee;font-weight:bold;">
 		<TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD>
diff --git a/did-listpermissions-html.lsp b/did-listpermissions-html.lsp
index 9b67191..4ec87a3 100644
--- a/did-listpermissions-html.lsp
+++ b/did-listpermissions-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"edituserpermissions", "editrolepermissions"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"edituserpermissions", "editrolepermissions"}, session) %>
 
 <H1><%= html.html_escape(view.label) %></H1>
 
diff --git a/did-model.lua b/did-model.lua
index 6b6ed7d..0786c94 100644
--- a/did-model.lua
+++ b/did-model.lua
@@ -2,8 +2,8 @@ module(..., package.seeall)
 
 -- Load libraries
 require("modelfunctions")
-require("format")
-require("validator")
+format = require("acf.format")
+validator = require("acf.validator")
 require("luasql.postgres")
 require("authenticator")
 require("roles")
diff --git a/did-searchdefinitions-html.lsp b/did-searchdefinitions-html.lsp
index 4ff0bac..bd8365b 100644
--- a/did-searchdefinitions-html.lsp
+++ b/did-searchdefinitions-html.lsp
@@ -1,5 +1,4 @@
 <% local form, viewlibrary, page_info, session = ... 
-require("viewfunctions")
 %>
 
 <% if session.didresult then %>
diff --git a/did-status-html.lsp b/did-status-html.lsp
index 470b26b..d12eaa5 100644
--- a/did-status-html.lsp
+++ b/did-status-html.lsp
@@ -1,8 +1,8 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"createdatabase"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"createdatabase"}, session, true) %>
 
 <H1>DID Database Status</H1>
 <DL>
diff --git a/template-searchdefinitionlist-text.lsp b/template-searchdefinitionlist-text.lsp
index e01ad7b..86aeda0 100644
--- a/template-searchdefinitionlist-text.lsp
+++ b/template-searchdefinitionlist-text.lsp
@@ -1,5 +1,4 @@
 <% local viewtable, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
 Status: 200 OK
 Content-Type: text/plain