summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2011-03-04 13:45:31 +0000
committerTed Trask <ttrask01@yahoo.com>2011-03-04 13:45:31 +0000
commitdb7eb8e8d58633c8aba11895f6c02590342a2abc (patch)
treeabed515938142c75b3ab2c2da281d3b79121cbdc
parentfa0606359cf903902b1b1a3d45b149716c8d3b74 (diff)
downloadacf-provisioning-db7eb8e8d58633c8aba11895f6c02590342a2abc.tar.bz2
acf-provisioning-db7eb8e8d58633c8aba11895f6c02590342a2abc.tar.xz
Made nice error messages for device_id search, rather than SQL errors
-rw-r--r--provisioning-model.lua10
1 files changed, 10 insertions, 0 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua
index 628cc8a..8f2470a 100644
--- a/provisioning-model.lua
+++ b/provisioning-model.lua
@@ -1528,6 +1528,16 @@ search_device_values = function(search)
local success = true
success = modelfunctions.validateselect(search.value.id) and success
success = modelfunctions.validateselect(search.value.comparison) and success
+ if search.value.id.value == "device_id" then
+ if string.match(search.value.comparison.value, "~") then
+ success = false
+ search.value.comparison.errtxt = "Cannot do regular expression comparison to device_id"
+ end
+ if not validator.is_integer(search.value.value.value) then
+ success = false
+ search.value.value.errtxt = "Must be an integer for comparison to device_id"
+ end
+ end
if success then
retval.result = cfe({type="structure", value={}, label="List of Devices", seq=4 })
local res, err = pcall(function()