summaryrefslogtreecommitdiffstats
path: root/rrdtool-model.lua
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2009-07-08 15:14:58 +0000
committerMika Havela <mika.havela@gmail.com>2009-07-08 15:14:58 +0000
commit0b06a9d18889bf7fcca47379a5c0ec986e29ca3d (patch)
tree7702543d445f7c86ca341b2c97151b82a5b98034 /rrdtool-model.lua
parent4fd29b69a10f27c6a48e5bba9d55a10241e6eb5c (diff)
downloadacf-rrdtool-0b06a9d18889bf7fcca47379a5c0ec986e29ca3d.tar.bz2
acf-rrdtool-0b06a9d18889bf7fcca47379a5c0ec986e29ca3d.tar.xz
Show graph-image in popup window
Diffstat (limited to 'rrdtool-model.lua')
-rw-r--r--rrdtool-model.lua15
1 files changed, 5 insertions, 10 deletions
diff --git a/rrdtool-model.lua b/rrdtool-model.lua
index 834cae3..fa124b7 100644
--- a/rrdtool-model.lua
+++ b/rrdtool-model.lua
@@ -204,21 +204,16 @@ function view_graph(self, graph_grp, graph_id)
}
local graphs = list_graphs()
- local settings = graphs[tostring(graph_grp)]["value"][tonumber(self.clientdata.id)]
- local filename = "/"..tostring(graph_grp).."_"..tostring(graph_id) ..
+ local settings = graphs[tostring(graph_grp)][tonumber(self.clientdata.id)]
+ local filename = "/".. string.lower(tostring(graph_grp)).."_"..tostring(graph_id) ..
(settings.filenameextention or ".png")
- settings.value = tostring(filename)
+ settings.output = tostring(filename)
--TODO: Loop the defaultsettings and put it in the settings table if there is missing some information
local cmd = "/usr/bin/rrdtool graph /usr/share/acf/www" .. tostring(filename) .. " "
- for k,v in pairs(settings.option) do
- if (v) and (#v > 0) then
- cmd = cmd .. "--".. format.escapespecialcharacters(k) .. " " ..
- format.escapespecialcharacters(v) .. " "
- end
- end
- cmd = cmd .. tostring(settings.variables)
+
+ cmd = cmd .. tostring(settings.value)
settings.cmd_query = cmd
local f = io.popen( tostring(cmd) .. " 2>&1" )
settings.cmd_result = f:read("*a") or ""