summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-18 01:54:35 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-18 01:54:35 +0000
commitef5c82c78eecaeba171337098cb260bc8e089b77 (patch)
treeea56c0469ea179a06810d7e552cf5b93fed2b4b9
parentab1ed27748958792d7e12500311ba62eb15b596b (diff)
downloadacf-rrdtool-ef5c82c78eecaeba171337098cb260bc8e089b77.tar.bz2
acf-rrdtool-ef5c82c78eecaeba171337098cb260bc8e089b77.tar.xz
Started work on updating for acf-core-0.15
Removed controllerfunctions library (still needs more work and corresponding work in model) Updated startstop functionality Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries
-rw-r--r--rrdtool-config-html.lsp6
-rw-r--r--rrdtool-controller.lua13
-rw-r--r--rrdtool-createrrd-html.lsp6
-rw-r--r--rrdtool-editgraphcfg-html.lsp12
-rw-r--r--rrdtool-expert-html.lsp4
-rw-r--r--rrdtool-listgraphcfg-html.lsp6
-rw-r--r--rrdtool-listgraphs-html.lsp1
-rw-r--r--rrdtool-listrrd-html.lsp4
-rw-r--r--rrdtool-model.lua16
-rwxr-xr-xrrdtool-newgraphcfg-html.lsp6
-rw-r--r--rrdtool-status-html.lsp6
-rw-r--r--rrdtool-viewgraph-popup.lsp1
-rw-r--r--template-popup.lsp2
13 files changed, 41 insertions, 42 deletions
diff --git a/rrdtool-config-html.lsp b/rrdtool-config-html.lsp
index 8779545..88aced9 100644
--- a/rrdtool-config-html.lsp
+++ b/rrdtool-config-html.lsp
@@ -1,9 +1,9 @@
<% local data, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
-<% displaycommandresults({"install","editgraphcfg"}, session) %>
-<% displaycommandresults({"delete", "rrdinfo"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"install","editgraphcfg"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"delete", "rrdinfo"}, session) %>
<H1>Configure</H1>
diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua
index 8fbdab5..aec0db2 100644
--- a/rrdtool-controller.lua
+++ b/rrdtool-controller.lua
@@ -1,8 +1,5 @@
module(..., package.seeall)
--- Load libraries
-require("controllerfunctions")
-
default_action = "status"
function status(self)
@@ -10,15 +7,15 @@ function status(self)
end
function config(self)
- return controllerfunctions.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Saved")
+ return self.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Saved")
end
function startstop(self)
- return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata)
+ return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
end
function expert(self)
- return controllerfunctions.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Saved")
+ return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Saved")
end
function listrrd(self)
@@ -29,7 +26,7 @@ function listrrd(self)
end
function createrrd(self)
- return controllerfunctions.handle_form(self, self.model.createnewrrd, function(value)
+ return self.handle_form(self, self.model.createnewrrd, function(value)
return self.model.savenewrrd(self, value, sessiondata.userinfo.userid)
end, self.clientdata, "Save", "Create new RRD", "File saved")
end
@@ -63,7 +60,7 @@ function config(self)
end
function editgraphcfg(self)
- config = controllerfunctions.handle_form(self,
+ config = self.handle_form(self,
function() return self.model.getgraphfile(self.clientdata.filename) end,
function(value)
return self.model.set_filedetails(self, value, sessiondata.userinfo.userid)
diff --git a/rrdtool-createrrd-html.lsp b/rrdtool-createrrd-html.lsp
index 7569279..507fca9 100644
--- a/rrdtool-createrrd-html.lsp
+++ b/rrdtool-createrrd-html.lsp
@@ -1,10 +1,10 @@
<% local form, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
-<% displaycommandresults({"createrrd"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createrrd"}, session) %>
<h1>Create new RRD</h1>
<%
local order = {"filename", "start", "step", "ds", "rra"}
- displayform(form, order)
+ htmlviewfunctions.displayform(form, order)
%>
diff --git a/rrdtool-editgraphcfg-html.lsp b/rrdtool-editgraphcfg-html.lsp
index 6b5a2f3..101861d 100644
--- a/rrdtool-editgraphcfg-html.lsp
+++ b/rrdtool-editgraphcfg-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
<% if form.type == "form" then %>
<H1>Configuration</H1>
@@ -10,16 +10,16 @@
<H3>File Details</H3>
<DL>
<%
-displayitem(form.value.filename)
-displayitem(form.value.filesize)
-displayitem(form.value.mtime)
+htmlviewfunctions.displayitem(form.value.filename)
+htmlviewfunctions.displayitem(form.value.filesize)
+htmlviewfunctions.displayitem(form.value.mtime)
%>
</DL>
<H3>File Content</H3>
<% if form.type == "form" then %>
<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
<input type="hidden" name="filename" value="<%= html.html_escape(form.value.filename.value) %>">
<% else %>
<DL>
@@ -31,7 +31,7 @@ displayitem(form.value.mtime)
<% if form.value.filecontent.descr then %><P CLASS='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<BR>") %></P><% end %>
<% if form.type == "form" then %>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
<% else %>
</DL>
<% end %>
diff --git a/rrdtool-expert-html.lsp b/rrdtool-expert-html.lsp
index c983b88..266fb53 100644
--- a/rrdtool-expert-html.lsp
+++ b/rrdtool-expert-html.lsp
@@ -1,10 +1,10 @@
<% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
<%
--[[ Temporary comment to speed things up
%>
-<% displaycommandresults({"startstop"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"startstop"}, session) %>
<% if viewlibrary and viewlibrary.dispatch_component then
viewlibrary.dispatch_component("status")
diff --git a/rrdtool-listgraphcfg-html.lsp b/rrdtool-listgraphcfg-html.lsp
index 83be263..74de6c7 100644
--- a/rrdtool-listgraphcfg-html.lsp
+++ b/rrdtool-listgraphcfg-html.lsp
@@ -1,8 +1,8 @@
<% local form, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
-<% displaycommandresults({"delete"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"delete"}, session) %>
<script type="text/javascript">
function javascript_confirm_graph(formID,filename) {
@@ -57,5 +57,5 @@ function javascript_confirm_graph(formID,filename) {
<h2>Create new Domain</h2>
<%
newfileform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/newfile"
- displayform(newfileform)
+ htmlviewfunctions.displayform(newfileform)
end %>
diff --git a/rrdtool-listgraphs-html.lsp b/rrdtool-listgraphs-html.lsp
index 9a41fb3..1eca35f 100644
--- a/rrdtool-listgraphs-html.lsp
+++ b/rrdtool-listgraphs-html.lsp
@@ -1,5 +1,4 @@
<% local data, viewlibrary, page_info, session = ...
-require("viewfunctions")
%>
<SCRIPT TYPE="text/javascript">
diff --git a/rrdtool-listrrd-html.lsp b/rrdtool-listrrd-html.lsp
index dff97a8..f4aeb74 100644
--- a/rrdtool-listrrd-html.lsp
+++ b/rrdtool-listrrd-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript">
@@ -57,6 +57,6 @@ function javascript_confirm_demo(formID,filename) {
<h2>Create new Domain</h2>
<%
newfileform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/newfile"
- displayform(newfileform)
+ htmlviewfunctions.displayform(newfileform)
end %>
diff --git a/rrdtool-model.lua b/rrdtool-model.lua
index d43875c..26a2e17 100644
--- a/rrdtool-model.lua
+++ b/rrdtool-model.lua
@@ -3,10 +3,10 @@ module(..., package.seeall)
-- Load libraries
require("modelfunctions")
require("posix")
-require("fs")
-require("format")
-require("date")
-require("validator")
+fs = require("acf.fs")
+format = require("acf.format")
+date = require("acf.date")
+validator = require("acf.validator")
-- Set variables
local configfile = "/etc/rrdtool/acf-rrdtool.conf"
@@ -64,8 +64,12 @@ end
-- ################################################################################
-- PUBLIC FUNCTIONS
-function startstop_service(action)
- return modelfunctions.startstop_service(processname, action)
+function get_startstop(clientdata)
+ return modelfunctions.get_startstop(processname)
+end
+
+function startstop_service(startstop, action)
+ return modelfunctions.startstop_service(startstop, action)
end
function getstatus()
diff --git a/rrdtool-newgraphcfg-html.lsp b/rrdtool-newgraphcfg-html.lsp
index 8c9a6b3..5d150d9 100755
--- a/rrdtool-newgraphcfg-html.lsp
+++ b/rrdtool-newgraphcfg-html.lsp
@@ -1,11 +1,11 @@
<% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
<H1>Create new rrdtool-graph file</H1>
<% if form.type == "form" then %>
<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
<H3>File Details</H3>
<DL>
<DT><% io.write(form.value.filename.label) %></DT>
@@ -25,6 +25,6 @@
<% if form.type == "form" then %>
<H3>Save</H3>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
<% end %>
</form>
diff --git a/rrdtool-status-html.lsp b/rrdtool-status-html.lsp
index 5cbff7f..05141bd 100644
--- a/rrdtool-status-html.lsp
+++ b/rrdtool-status-html.lsp
@@ -1,13 +1,13 @@
<% local data, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
-<% displaycommandresults({"install","edit"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"install","edit"}, session) %>
<H1>System Info</H1>
<DL>
<%
-displayitem(data.value.version)
+htmlviewfunctions.displayitem(data.value.version)
%>
</DL>
diff --git a/rrdtool-viewgraph-popup.lsp b/rrdtool-viewgraph-popup.lsp
index 42194a5..ac47a6d 100644
--- a/rrdtool-viewgraph-popup.lsp
+++ b/rrdtool-viewgraph-popup.lsp
@@ -1,5 +1,4 @@
<% local data, viewlibrary, page_info, session = ...
-require("viewfunctions")
%>
<% if (data.graph.width) then %>
diff --git a/template-popup.lsp b/template-popup.lsp
index 7787c5a..c174a7e 100644
--- a/template-popup.lsp
+++ b/template-popup.lsp
@@ -1,5 +1,5 @@
<% local viewtable, viewlibrary, pageinfo, session = ...
- html=require("html") %>
+ html = require("acf.html") %>
Status: 200 OK
Content-Type: text/html
<% if (session.id) then