Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added UVL values minlength, maxlength, minimum, maximum

Browse source
This commit is contained in:
Steven Barth 2008-11-02 21:42:16 +00:00
parent 9e4c03a9c3
commit de80e2a708
3 changed files with 64 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libs/uvl/luasrc/uvl.lua
View file

@ -334,6 +334,30 @@ function UVL._validate_option( self, option, nodeps )
return false, option:error(ERR.OPT_DATATYPE(option, dt)) return false, option:error(ERR.OPT_DATATYPE(option, dt))
end end
end end
if option:scheme('minlength') then
if #val < option:scheme('minlength') then
return false, option:error(ERR.OPT_RANGE(option))
end
end
if option:scheme('maxlength') then
if #val > option:scheme('maxlength') then
return false, option:error(ERR.OPT_RANGE(option))
end
end
if option:scheme('minimum') then
if val < option:scheme('minimum') then
return false, option:error(ERR.OPT_RANGE(option))
end
end
if option:scheme('maximum') then
if val > option:scheme('maximum') then
return false, option:error(ERR.OPT_RANGE(option))
end
end
if not nodeps then if not nodeps then
local ok, err = dependencies.check( self, option ) local ok, err = dependencies.check( self, option )
@ -582,6 +606,9 @@ function UVL._parse_var(self, scheme, k, v)
t.valueof = type(v2) == "table" and v2 or {v2} t.valueof = type(v2) == "table" and v2 or {v2}
elseif k == "required" then elseif k == "required" then
t[k] = _bool(v2) t[k] = _bool(v2)
elseif k == "minlength" or k == "maxlength"
or k == "minimum" or k == "maximum" then
t[k] = tonumber(v2)
else else
t[k] = t[k] or v2 t[k] = t[k] or v2
end end

1
libs/uvl/luasrc/uvl/errors.lua
View file

@ -66,6 +66,7 @@ ERRCODES = {
{ 'OPT_NOTLIST', 'Option "%i" is defined as list but stored as plain value' }, { 'OPT_NOTLIST', 'Option "%i" is defined as list but stored as plain value' },
{ 'OPT_DATATYPE', 'Option "%i" has unknown datatype "%1"' }, { 'OPT_DATATYPE', 'Option "%i" has unknown datatype "%1"' },
{ 'OPT_NOTFOUND', 'Option "%p.%s.%o" not found in config' }, { 'OPT_NOTFOUND', 'Option "%p.%s.%o" not found in config' },
{ 'OPT_RANGE', 'Option "%p.%s.%o" is not within the specified range' },
{ 'DEP_NOTEQUAL', 'Dependency (%1) failed:\nOption "%i" is not eqal "%2"' }, { 'DEP_NOTEQUAL', 'Dependency (%1) failed:\nOption "%i" is not eqal "%2"' },
{ 'DEP_NOVALUE', 'Dependency (%1) failed:\nOption "%i" has no value' }, { 'DEP_NOVALUE', 'Dependency (%1) failed:\nOption "%i" has no value' },

36
libs/uvl/root/lib/uci/schema/meta/schema
View file

@ -275,6 +275,42 @@ config variable
option type 'variable' option type 'variable'
option datatype 'string' option datatype 'string'
option required false option required false
# Variable minimum length (schema.@variable.minlength)
config variable
option name 'minlength'
option title 'Minimum length of this variable'
option section 'schema.variable'
option type 'variable'
option datatype 'uint'
option required false
# Variable maximum length (schema.@variable.minlength)
config variable
option name 'maxlength'
option title 'Maximum length of this variable'
option section 'schema.variable'
option type 'variable'
option datatype 'uint'
option required false
# Variable minimum value (schema.@variable.minlength)
config variable
option name 'minimum'
option title 'Minimum value of this variable'
option section 'schema.variable'
option type 'variable'
option datatype 'integer'
option required false
# Variable maximum value (schema.@variable.minlength)
config variable
option name 'maximum'
option title 'Maximum value of this variable'
option section 'schema.variable'
option type 'variable'
option datatype 'integer'
option required false
# Variable validators (schema.@variable.validator) # Variable validators (schema.@variable.validator)
config variable config variable