diff options
author | Mika Havela <mika.havela@gmail.com> | 2009-07-03 13:38:53 +0000 |
---|---|---|
committer | Mika Havela <mika.havela@gmail.com> | 2009-07-03 13:38:53 +0000 |
commit | 6a8e9ac461eca45721f402cef4ccc76c2af64461 (patch) | |
tree | c5e31dc3bdf3f2891b42615937efb106f60e3548 | |
parent | efa6b500d78bcbfbf63da5d45f669796aa3f993a (diff) | |
download | acf-rrdtool-6a8e9ac461eca45721f402cef4ccc76c2af64461.tar.bz2 acf-rrdtool-6a8e9ac461eca45721f402cef4ccc76c2af64461.tar.xz |
Cosmetical change in model
-rw-r--r-- | rrdtool-model.lua | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/rrdtool-model.lua b/rrdtool-model.lua index 30a65f4..4e1315d 100644 --- a/rrdtool-model.lua +++ b/rrdtool-model.lua @@ -152,36 +152,36 @@ function savenewrrd(self, configfile, userid) If you specify path, it should be " .. tostring(databases) .."/" return configfile end - if (posix.stat(path)) then - configfile.value.filename.errtxt = "File already exists" - elseif not tonumber(configfile.value.start.value) then - configfile.value.start.errtxt = "Only numeric values!" - return configfile - elseif not tonumber(configfile.value.step.value) then - configfile.value.step.errtxt = "Only numeric values!" - return configfile + if (posix.stat(path)) then + configfile.value.filename.errtxt = "File already exists" + elseif not tonumber(configfile.value.start.value) then + configfile.value.start.errtxt = "Only numeric values!" + return configfile + elseif not tonumber(configfile.value.step.value) then + configfile.value.step.errtxt = "Only numeric values!" + return configfile + else + local start,step + if (#configfile.value.start.value > 0) then + start = "--start " .. tostring(configfile.value.start.value) .. " " else - local start,step - if (#configfile.value.start.value > 0) then - start = "--start " .. tostring(configfile.value.start.value) .. " " - else - start = "" - end - if (#configfile.value.step.value > 0) then - step = "--step " .. tostring(configfile.value.step.value) .. " " - else - step = "" - end - local f = io.popen( "/usr/bin/rrdtool create ".. - format.escapespecialcharacters(path) .. " " .. - format.escapespecialcharacters(start) .. - format.escapespecialcharacters(step) .. - tostring(string.gsub(format.dostounix(format.escapespecialcharacters(configfile.value.ds.value)),"\n", " \\\n")) .. " " .. - tostring(string.gsub(format.dostounix(format.escapespecialcharacters(configfile.value.rra.value)),"\n", " \\\n")) .. " 2>&1") - success = f:read("*a") or "" - f:close() - configfile.errtxt = tostring(success) + start = "" + end + if (#configfile.value.step.value > 0) then + step = "--step " .. tostring(configfile.value.step.value) .. " " + else + step = "" end + local f = io.popen( "/usr/bin/rrdtool create ".. + format.escapespecialcharacters(path) .. " " .. + format.escapespecialcharacters(start) .. + format.escapespecialcharacters(step) .. + tostring(string.gsub(format.dostounix(format.escapespecialcharacters(configfile.value.ds.value)),"\n", " \\\n")) .. " " .. + tostring(string.gsub(format.dostounix(format.escapespecialcharacters(configfile.value.rra.value)),"\n", " \\\n")) .. " 2>&1") + success = f:read("*a") or "" + f:close() + configfile.errtxt = tostring(success) + end return configfile end |