Moved non-ACF-specific libraries to acf-lib package, moved cfe_unpack function to viewfunctions library.

9 files changed, 10 insertions, 35 deletions

diff --git a/app/acf-util/logon-html.lsp b/app/acf-util/logon-html.lsp
index 643ab86..bfb5740 100644
--- a/app/acf-util/logon-html.lsp
+++ b/app/acf-util/logon-html.lsp
@@ -1,8 +1,5 @@
 <% local form = ... %>
 <% require("viewfunctions") %>
-<% --[[
-       io.write(html.cfe_unpack(form))
-   --]] %>
 
 <h1><%= html.html_escape(form.label) %></h1>
 <%
diff --git a/app/acf-util/logon-logout-html.lsp b/app/acf-util/logon-logout-html.lsp
index b7b72f4..54aa9bb 100644
--- a/app/acf-util/logon-logout-html.lsp
+++ b/app/acf-util/logon-logout-html.lsp
@@ -1,6 +1,7 @@
 <% local view= ... %> 
+<% require("viewfunctions") %>
 <h1>Log Out</h1>
 
-<%= html.cfe_unpack(view) %>
+<%= cfe_unpack(view) %>
 
 <%= html.html_escape(view.logout.value) %>
diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp
index 7de8f88..82551fc 100644
--- a/app/acf-util/password-html.lsp
+++ b/app/acf-util/password-html.lsp
@@ -1,13 +1,5 @@
 <% local form, viewlibrary, pageinfo = ... %>
 <% require("viewfunctions") %>
-<%
---[[ DEBUG INFORMATION
-io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
-io.write(html.cfe_unpack(form))
-io.write(html.cfe_unpack(FORM))
-io.write("</span>")
---]]
-%>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <% 
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index eb960be..4a34fab 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,12 +1,5 @@
 <% local form, viewlibrary, page_info, session = ... %>
 <% require("viewfunctions") %>
-<%
---[[ DEBUG INFORMATION
-io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
-io.write(html.cfe_unpack(form))
-io.write("</span>")
---]]
-%>
 
 <% displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
 
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 1f8f24e..b2c5aa7 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -1,10 +1,6 @@
 <% local view, viewlibrary, page_info, session= ... %>
 <% require("viewfunctions") %>
 
-<% --[[
-	io.write(html.cfe_unpack(view))
---]] %>
-
 <% displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
 
 <H1>Roles</H1>
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 88bc934..85ff3a8 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -1,9 +1,10 @@
 <% view = ... %>
+<% require("viewfunctions") %>
 <h1>Alpine Configuration Framework</h1>
 <DL><p>Welcome.</p></DL>
 
 <% --[[
-	io.write(html.cfe_unpack(view))
-	io.write(html.cfe_unpack(FORM))
-	io.write(html.cfe_unpack(ENV))
+	io.write(cfe_unpack(view))
+	io.write(cfe_unpack(FORM))
+	io.write(cfe_unpack(ENV))
 --]] %>
diff --git a/app/debug-html.lsp b/app/debug-html.lsp
index d3db3b4..f9d160b 100644
--- a/app/debug-html.lsp
+++ b/app/debug-html.lsp
@@ -1,8 +1,9 @@
 <% local data, viewlibrary, page_info, session = ... %>
+<% require("viewfunctions") %>
 <H1>Debugging</H1>
 <H2>View Data:</H2>
-<%= html.cfe_unpack(data) %>
+<%= cfe_unpack(data) %>
 <H2>Session:</H2>
-<%= html.cfe_unpack(session) %>
+<%= cfe_unpack(session) %>
 <H2>Page Info:</H2>
-<%= html.cfe_unpack(page_info) %>
+<%= cfe_unpack(page_info) %>
diff --git a/app/dispatcherror-html.lsp b/app/dispatcherror-html.lsp
index f6e0a22..fde2f03 100644
--- a/app/dispatcherror-html.lsp
+++ b/app/dispatcherror-html.lsp
@@ -1,7 +1,4 @@
 <% view = ... %>
-<% --[[
-	io.write(html.cfe_unpack(view))
---]] %>
 
 <style type="text/css">
 	p.hiddendetail {
diff --git a/app/exception-html.lsp b/app/exception-html.lsp
index 3bd6621..03bfaf8 100644
--- a/app/exception-html.lsp
+++ b/app/exception-html.lsp
@@ -1,7 +1,4 @@
 <% view = ... %>
-<% --[[
-	io.write(html.cfe_unpack(view))
---]] %>
 
 <style type="text/css">
 	p.hiddendetail {