sipwise
/
lua-ngcp-kamailio
mirror of https://github.com/sipwise/lua-ngcp-kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#12025 clean luacheck error

Browse Source 
Change-Id: I247be4018189e393c1a8d7ee9fa7b455cc38f1a7
changes/94/2394/1
Victor Seva 10 years ago
parent 203896e16a
commit 7a52fc6ad5
15 changed files with 62 additions and 91 deletions
Show Stats Download Patch File Download Diff File

1
ngcp/.luacheckrc
Unescape View File

@ -1 +1,2 @@
globals = {'sr', '_ENV'} globals = {'sr', '_ENV'}
ignore = { 'NGCP.*', '212' }

19
ngcp/avp.lua
Unescape View File

@ -27,20 +27,17 @@ NGCPAvp_MT = {
function NGCPAvp:new(id) function NGCPAvp:new(id)
local t = { id = "$avp(s:" .. id .. ")" } local t = { id = "$avp(s:" .. id .. ")" }
NGCPAvp_MT.__call = function(t, value) NGCPAvp_MT.__call = function(s, value)
if not value then if not value then
--print(table.tostring(sr.pv.vars)) return sr.pv.get(s.id)
--print(t.id)
return sr.pv.get(t.id)
elseif type(value) == "table" then elseif type(value) == "table" then
local i, v
for i = #value, 1, -1 do for i = #value, 1, -1 do
t(value[i]) s(value[i])
end end
elseif type(value) == "number" then elseif type(value) == "number" then
sr.pv.seti(t.id, value) sr.pv.seti(s.id, value)
elseif type(value) == "string" then elseif type(value) == "string" then
sr.pv.sets(t.id, value) sr.pv.sets(s.id, value)
else else
error("value is not a number or string") error("value is not a number or string")
end end
@ -48,9 +45,9 @@ NGCPAvp_MT = {
function t.all() function t.all()
return sr.pv.get("$(avp(" .. id .. ")[*])") return sr.pv.get("$(avp(" .. id .. ")[*])")
end end
NGCPAvp_MT.__tostring = function(t) NGCPAvp_MT.__tostring = function(s)
local value = sr.pv.get(t.id) local value = sr.pv.get(s.id)
return string.format("%s:%s", t.id, tostring(value)) return string.format("%s:%s", s.id, tostring(value))
end end
return setmetatable( t, NGCPAvp_MT ) return setmetatable( t, NGCPAvp_MT )
end end

6
ngcp/config.lua
Unescape View File

@ -20,6 +20,7 @@
-- load drivers -- load drivers
local driver = require "luasql.mysql" local driver = require "luasql.mysql"
-- luacheck: ignore luasql
if not luasql then if not luasql then
luasql = driver luasql = driver
end end
@ -77,8 +78,8 @@ NGCPConfig_MT = { __index = NGCPConfig }
local function check_connection(c) local function check_connection(c)
local cur = c:execute("SELECT 1") local cur = c:execute("SELECT 1")
local row = cur:fetch()
local result = false local result = false
cur:fetch()
if cur:numrows() == 1 then if cur:numrows() == 1 then
result = true result = true
end end
@ -91,7 +92,7 @@ NGCPConfig_MT = { __index = NGCPConfig }
self.env = assert (luasql.mysql()) self.env = assert (luasql.mysql())
end end
if self.con then if self.con then
local ok,err = pcall(check_connection, self.con) local ok,_ = pcall(check_connection, self.con)
if not ok then if not ok then
self.con = nil self.con = nil
sr.log("dbg", "lost database connection. Reconnecting") sr.log("dbg", "lost database connection. Reconnecting")
@ -106,7 +107,6 @@ NGCPConfig_MT = { __index = NGCPConfig }
end end
function NGCPConfig:get_defaults(vtype) function NGCPConfig:get_defaults(vtype)
local k,v
local defs = {} local defs = {}
if self.default[vtype] then if self.default[vtype] then

6
ngcp/cp.lua
Unescape View File

@ -27,7 +27,7 @@ NGCPContractPrefs = {
NGCPContractPrefs_MT = { __index = NGCPContractPrefs } NGCPContractPrefs_MT = { __index = NGCPContractPrefs }
NGCPContractPrefs_MT.__tostring = function () NGCPContractPrefs_MT.__tostring = function ()
local output = '' local output
local xavp = NGCPXAvp:new('caller','contract_prefs') local xavp = NGCPXAvp:new('caller','contract_prefs')
output = string.format("caller_contract_prefs:%s\n", tostring(xavp)) output = string.format("caller_contract_prefs:%s\n", tostring(xavp))
xavp = NGCPXAvp:new('callee','contract_prefs') xavp = NGCPXAvp:new('callee','contract_prefs')
@ -59,10 +59,9 @@ NGCPContractPrefs_MT.__tostring = function ()
return NGCPContractPrefs._load(self,"callee",contract) return NGCPContractPrefs._load(self,"callee",contract)
end end
function NGCPContractPrefs:_defaults(level) function NGCPContractPrefs:_defaults(_)
local defaults = self.config:get_defaults('contract') local defaults = self.config:get_defaults('contract')
local keys = {} local keys = {}
local k,_
if defaults then if defaults then
for k,_ in pairs(defaults) do for k,_ in pairs(defaults) do
@ -80,7 +79,6 @@ NGCPContractPrefs_MT.__tostring = function ()
local keys local keys
local result = {} local result = {}
local row = cur:fetch({}, "a") local row = cur:fetch({}, "a")
local k,v
local xavp local xavp
keys, defaults = self:_defaults(level) keys, defaults = self:_defaults(level)

2
ngcp/dlgcnt.lua
Unescape View File

@ -63,7 +63,7 @@ end
function NGCPDlgCounters._test_connection(client) function NGCPDlgCounters._test_connection(client)
if not client then return nil end if not client then return nil end
local ok, err = pcall(client.ping, client); local ok, _ = pcall(client.ping, client);
return ok return ok
end end

2
ngcp/dlglist.lua
Unescape View File

@ -63,7 +63,7 @@ end
local function _test_connection(client) local function _test_connection(client)
if not client then return nil end if not client then return nil end
local ok, err = pcall(client.ping, client); local ok, _ = pcall(client.ping, client);
return ok return ok
end end

5
ngcp/dp.lua
Unescape View File

@ -27,9 +27,8 @@ NGCPDomainPrefs = {
NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs } NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs }
NGCPDomainPrefs_MT.__tostring = function () NGCPDomainPrefs_MT.__tostring = function ()
local output = ''
local xavp = NGCPXAvp:new('caller','dom_prefs') local xavp = NGCPXAvp:new('caller','dom_prefs')
output = string.format("caller_dom_prefs:%s\n", tostring(xavp)) local output = string.format("caller_dom_prefs:%s\n", tostring(xavp))
xavp = NGCPXAvp:new('callee','dom_prefs') xavp = NGCPXAvp:new('callee','dom_prefs')
output = output .. string.format("callee_dom_prefs:%s\n", tostring(xavp)) output = output .. string.format("callee_dom_prefs:%s\n", tostring(xavp))
return output return output
@ -62,7 +61,6 @@ NGCPDomainPrefs_MT.__tostring = function ()
function NGCPDomainPrefs:_defaults(level) function NGCPDomainPrefs:_defaults(level)
local defaults = self.config:get_defaults('dom') local defaults = self.config:get_defaults('dom')
local keys = {} local keys = {}
local k,_
if defaults then if defaults then
for k,_ in pairs(defaults) do for k,_ in pairs(defaults) do
@ -80,7 +78,6 @@ NGCPDomainPrefs_MT.__tostring = function ()
local keys local keys
local result = {} local result = {}
local row = cur:fetch({}, "a") local row = cur:fetch({}, "a")
local k,v
local xavp local xavp
keys, defaults = self:_defaults(level) keys, defaults = self:_defaults(level)

18
ngcp/ngcp.lua
Unescape View File

@ -32,9 +32,8 @@ NGCP = {
NGCP_MT = { __index = NGCP } NGCP_MT = { __index = NGCP }
NGCP_MT.__tostring = function (t) NGCP_MT.__tostring = function (t)
local k,v local output = ''
output = '' for _,v in pairs(t.prefs) do
for k,v in pairs(t.prefs) do
output = output .. tostring(v) output = output .. tostring(v)
end end
return output return output
@ -62,7 +61,6 @@ end
end end
function NGCP:caller_contract_load(contract) function NGCP:caller_contract_load(contract)
local _,v, xvap
local keys = self.prefs.contract:caller_load(contract) local keys = self.prefs.contract:caller_load(contract)
self.prefs.real:caller_contract_load(keys) self.prefs.real:caller_contract_load(keys)
@ -70,7 +68,6 @@ end
end end
function NGCP:callee_contract_load(contract) function NGCP:callee_contract_load(contract)
local _,v, xvap
local keys = self.prefs.contract:callee_load(contract) local keys = self.prefs.contract:callee_load(contract)
self.prefs.real:callee_contract_load(keys) self.prefs.real:callee_contract_load(keys)
@ -78,7 +75,6 @@ end
end end
function NGCP:caller_peer_load(peer) function NGCP:caller_peer_load(peer)
local _,v, xvap
local keys = self.prefs.peer:caller_load(peer) local keys = self.prefs.peer:caller_load(peer)
self.prefs.real:caller_peer_load(keys) self.prefs.real:caller_peer_load(keys)
@ -86,7 +82,6 @@ end
end end
function NGCP:callee_peer_load(peer) function NGCP:callee_peer_load(peer)
local _,v, xvap
local keys = self.prefs.peer:callee_load(peer) local keys = self.prefs.peer:callee_load(peer)
self.prefs.real:callee_peer_load(keys) self.prefs.real:callee_peer_load(keys)
@ -94,7 +89,6 @@ end
end end
function NGCP:caller_usr_load(uuid, domain) function NGCP:caller_usr_load(uuid, domain)
local _,v
local keys = { local keys = {
domain = self.prefs.dom:caller_load(domain), domain = self.prefs.dom:caller_load(domain),
prof = self.prefs.prof:caller_load(uuid), prof = self.prefs.prof:caller_load(uuid),
@ -105,13 +99,12 @@ end
table.merge(unique_keys, keys.user) table.merge(unique_keys, keys.user)
self.prefs.real:caller_usr_load(unique_keys) self.prefs.real:caller_usr_load(unique_keys)
local xavp = NGCPXAvp:new('caller', 'dom') NGCPXAvp:new('caller', 'dom')
return unique_keys return unique_keys
end end
function NGCP:callee_usr_load(uuid, domain) function NGCP:callee_usr_load(uuid, domain)
local _,v
local keys = { local keys = {
domain = self.prefs.dom:callee_load(domain), domain = self.prefs.dom:callee_load(domain),
prof = self.prefs.prof:callee_load(uuid), prof = self.prefs.prof:callee_load(uuid),
@ -127,7 +120,7 @@ end
end end
function NGCP:log_pref(level, vtype) function NGCP:log_pref(level, vtype)
local _,pref,xavp,xavp_log local xavp,xavp_log
if not level then if not level then
level = "dbg" level = "dbg"
@ -157,9 +150,8 @@ end
end end
function NGCP:clean(vtype, group) function NGCP:clean(vtype, group)
local _,k,v
if not group then if not group then
for k,v in pairs(self.prefs) do for _,v in pairs(self.prefs) do
v:clean(vtype) v:clean(vtype)
end end
else else

7
ngcp/pp.lua
Unescape View File

@ -27,9 +27,8 @@ NGCPPeerPrefs = {
NGCPPeerPrefs_MT = { __index = NGCPPeerPrefs } NGCPPeerPrefs_MT = { __index = NGCPPeerPrefs }
NGCPPeerPrefs_MT.__tostring = function () NGCPPeerPrefs_MT.__tostring = function ()
local output = ''
local xavp = NGCPXAvp:new('caller','peer_prefs') local xavp = NGCPXAvp:new('caller','peer_prefs')
output = string.format("caller_peer_prefs:%s\n", tostring(xavp)) local output = string.format("caller_peer_prefs:%s\n", tostring(xavp))
xavp = NGCPXAvp:new('callee','peer_prefs') xavp = NGCPXAvp:new('callee','peer_prefs')
output = output .. string.format("callee_peer_prefs:%s\n", tostring(xavp)) output = output .. string.format("callee_peer_prefs:%s\n", tostring(xavp))
return output return output
@ -64,10 +63,9 @@ NGCPPeerPrefs_MT.__tostring = function ()
function NGCPPeerPrefs:_defaults(level) function NGCPPeerPrefs:_defaults(level)
local defaults = self.config:get_defaults('peer') local defaults = self.config:get_defaults('peer')
local keys = {} local keys = {}
local k,_
if defaults then if defaults then
for k,v in pairs(defaults) do for k,_ in pairs(defaults) do
table.insert(keys, k) table.insert(keys, k)
end end
end end
@ -82,7 +80,6 @@ NGCPPeerPrefs_MT.__tostring = function ()
local keys local keys
local result = {} local result = {}
local row = cur:fetch({}, "a") local row = cur:fetch({}, "a")
local k,v
local xavp local xavp
keys, defaults = self:_defaults(level) keys, defaults = self:_defaults(level)

7
ngcp/pprof.lua
Unescape View File

@ -28,9 +28,8 @@ NGCPProfilePrefs = {
NGCPProfilePrefs_MT = { __index = NGCPProfilePrefs } NGCPProfilePrefs_MT = { __index = NGCPProfilePrefs }
NGCPProfilePrefs_MT.__tostring = function () NGCPProfilePrefs_MT.__tostring = function ()
local output = ''
local xavp = NGCPXAvp:new('caller','prof_prefs') local xavp = NGCPXAvp:new('caller','prof_prefs')
output = string.format("caller_prof_prefs:%s\n", tostring(xavp)) local output = string.format("caller_prof_prefs:%s\n", tostring(xavp))
xavp = NGCPXAvp:new('callee','prof_prefs') xavp = NGCPXAvp:new('callee','prof_prefs')
output = output .. string.format("callee_prof_prefs:%s\n", tostring(xavp)) output = output .. string.format("callee_prof_prefs:%s\n", tostring(xavp))
return output return output
@ -70,8 +69,6 @@ NGCPProfilePrefs_MT.__tostring = function ()
local keys = {} local keys = {}
local result = {} local result = {}
local row = cur:fetch({}, "a") local row = cur:fetch({}, "a")
local k,v
local xavp
if table.size(row) > 0 then if table.size(row) > 0 then
while table.size(row) > 0 do while table.size(row) > 0 do
@ -85,7 +82,7 @@ NGCPProfilePrefs_MT.__tostring = function ()
end end
cur:close() cur:close()
if table.size(result) > 0 then if table.size(result) > 0 then
xavp = self:xavp(level, result) self:xavp(level, result)
end end
return keys return keys
end end

3
ngcp/pref.lua
Unescape View File

@ -27,10 +27,9 @@ NGCPPrefs = {
NGCPPrefs_MT = { __index = NGCPPrefs } NGCPPrefs_MT = { __index = NGCPPrefs }
function NGCPPrefs.init(group) function NGCPPrefs.init(group)
local _,v, xavp
local levels = {"caller", "callee"} local levels = {"caller", "callee"}
for _,v in pairs(levels) do for _,v in pairs(levels) do
xavp = NGCPXAvp.init(v,group) NGCPXAvp.init(v,group)
end end
end end
-- class -- class

6
ngcp/rp.lua
Unescape View File

@ -31,9 +31,8 @@ NGCPRealPrefs = {
NGCPRealPrefs_MT = { __index = NGCPRealPrefs } NGCPRealPrefs_MT = { __index = NGCPRealPrefs }
NGCPRealPrefs_MT.__tostring = function () NGCPRealPrefs_MT.__tostring = function ()
local output = ''
local xavp = NGCPXAvp:new('caller','real_prefs') local xavp = NGCPXAvp:new('caller','real_prefs')
output = string.format("caller_real_prefs:%s\n", tostring(xavp)) local output = string.format("caller_real_prefs:%s\n", tostring(xavp))
xavp = NGCPXAvp:new('callee','real_prefs') xavp = NGCPXAvp:new('callee','real_prefs')
output = output .. string.format("callee_real_prefs:%s\n", tostring(xavp)) output = output .. string.format("callee_real_prefs:%s\n", tostring(xavp))
return output return output
@ -71,7 +70,6 @@ NGCPRealPrefs_MT.__tostring = function ()
end end
function NGCPRealPrefs:_contract_load(level, keys) function NGCPRealPrefs:_contract_load(level, keys)
local _,v
local xavp = { local xavp = {
contract = NGCPContractPrefs:xavp(level), contract = NGCPContractPrefs:xavp(level),
} }
@ -87,7 +85,6 @@ NGCPRealPrefs_MT.__tostring = function ()
end end
function NGCPRealPrefs:_peer_load(level, keys) function NGCPRealPrefs:_peer_load(level, keys)
local _,v
local xavp = { local xavp = {
peer = NGCPPeerPrefs:xavp(level), peer = NGCPPeerPrefs:xavp(level),
} }
@ -103,7 +100,6 @@ NGCPRealPrefs_MT.__tostring = function ()
end end
function NGCPRealPrefs:_usr_load(level, keys) function NGCPRealPrefs:_usr_load(level, keys)
local _,v,k
local xavp = { local xavp = {
real = NGCPRealPrefs:xavp(level), real = NGCPRealPrefs:xavp(level),
dom = NGCPDomainPrefs:xavp(level), dom = NGCPDomainPrefs:xavp(level),

7
ngcp/up.lua
Unescape View File

@ -27,9 +27,8 @@ NGCPUserPrefs = {
NGCPUserPrefs_MT = { __index = NGCPUserPrefs } NGCPUserPrefs_MT = { __index = NGCPUserPrefs }
NGCPUserPrefs_MT.__tostring = function () NGCPUserPrefs_MT.__tostring = function ()
local output = ''
local xavp = NGCPXAvp:new('caller','usr_prefs') local xavp = NGCPXAvp:new('caller','usr_prefs')
output = string.format("caller_usr_prefs:%s\n", tostring(xavp)) local output = string.format("caller_usr_prefs:%s\n", tostring(xavp))
xavp = NGCPXAvp:new('callee','usr_prefs') xavp = NGCPXAvp:new('callee','usr_prefs')
output = output .. string.format("callee_usr_prefs:%s\n", tostring(xavp)) output = output .. string.format("callee_usr_prefs:%s\n", tostring(xavp))
return output return output
@ -62,10 +61,9 @@ NGCPUserPrefs_MT.__tostring = function ()
function NGCPUserPrefs:_defaults(level) function NGCPUserPrefs:_defaults(level)
local defaults = self.config:get_defaults('usr') local defaults = self.config:get_defaults('usr')
local keys = {} local keys = {}
local k,_
if defaults then if defaults then
for k,v in pairs(defaults) do for k,_ in pairs(defaults) do
table.insert(keys, k) table.insert(keys, k)
end end
end end
@ -81,7 +79,6 @@ NGCPUserPrefs_MT.__tostring = function ()
local keys local keys
local result = {} local result = {}
local row = cur:fetch({}, "a") local row = cur:fetch({}, "a")
local k,v
local xavp local xavp
keys, defaults = self:_defaults(level) keys, defaults = self:_defaults(level)

37
ngcp/utils.lua
Unescape View File

@ -19,6 +19,7 @@
-- --
-- Lua utils -- Lua utils
-- luacheck: globals math table string
-- improving the built-in pseudorandom generator -- improving the built-in pseudorandom generator
-- http://lua-users.org/wiki/MathLibraryTutorial -- http://lua-users.org/wiki/MathLibraryTutorial
do do
@ -41,18 +42,18 @@ end
-- copy a table -- copy a table
function table.deepcopy(object) function table.deepcopy(object)
local lookup_table = {} local lookup_table = {}
local function _copy(object) local function _copy(obj)
if type(object) ~= "table" then if type(obj) ~= "table" then
return object return obj
elseif lookup_table[object] then elseif lookup_table[obj] then
return lookup_table[object] return lookup_table[obj]
end end
local new_table = {} local new_table = {}
lookup_table[object] = new_table lookup_table[obj] = new_table
for index, value in pairs(object) do for index, value in pairs(obj) do
new_table[_copy(index)] = _copy(value) new_table[_copy(index)] = _copy(value)
end end
return setmetatable(new_table, getmetatable(object)) return setmetatable(new_table, getmetatable(obj))
end end
return _copy(object) return _copy(object)
end end
@ -76,7 +77,7 @@ function table.add(t, element)
end end
function table.del(t, element) function table.del(t, element)
local _,v,i local i
local pos = {} local pos = {}
if t then if t then
@ -107,8 +108,7 @@ end
function table.size(t) function table.size(t)
if t then if t then
local c = 0 local c = 0
local _,v for _ in pairs(t) do
for _,v in pairs(t) do
c = c + 1 c = c + 1
end end
return c return c
@ -162,6 +162,7 @@ function table.shuffle(tab)
return res return res
end end
-- luacheck: ignore range
-- range(start) returns an iterator from 1 to a (step = 1) -- range(start) returns an iterator from 1 to a (step = 1)
-- range(start, stop) returns an iterator from a to b (step = 1) -- range(start, stop) returns an iterator from a to b (step = 1)
-- range(start, stop, step) returns an iterator from a to b, counting by step. -- range(start, stop, step) returns an iterator from a to b, counting by step.
@ -185,17 +186,16 @@ range = function (i, to, inc)
end end
function table.shift(t, position) function table.shift(t, position)
local k, v
local res = {} local res = {}
local p = position % #t local p = position % #t
if p == 0 then return end if p == 0 then return end
for k in range(1, p) do for k in range(1, p) do
v = table.remove(t, k-#res) local v = table.remove(t, k-#res)
table.insert(res, v) table.insert(res, v)
end end
for _,v in ipairs(res) do for _,_v in ipairs(res) do
table.insert(t, v) table.insert(t, _v)
end end
end end
@ -205,6 +205,7 @@ end
-- "'a','b'" -- "'a','b'"
-- implode("#",t) -- implode("#",t)
-- "a#b" -- "a#b"
-- luacheck: ignore implode explode
function implode(delimiter, list, quoter) function implode(delimiter, list, quoter)
local len = #list local len = #list
if not delimiter then if not delimiter then
@ -265,6 +266,7 @@ end
-- Lua 5.1 compatible -- Lua 5.1 compatible
-- GLOBAL -- GLOBAL
-- luacheck: ignore Stack.*
Stack = { Stack = {
__class__ = 'Stack' __class__ = 'Stack'
} }
@ -308,14 +310,15 @@ Stack_MT = {
end end
-- pop a value from the stack -- pop a value from the stack
function Stack:pop(num) function Stack:pop(n)
-- get num values from stack -- get num values from stack
local num = num or 1 local num = n or 1
-- return table -- return table
local entries = {} local entries = {}
-- get values into entries -- get values into entries
-- luacheck: ignore i
for i = 1, num do for i = 1, num do
-- get last entry -- get last entry
if #self._et ~= 0 then if #self._et ~= 0 then

27
ngcp/xavp.lua
Unescape View File

@ -28,27 +28,26 @@ NGCPXAvp_MT = {
} }
function NGCPXAvp:new(level,group,l) function NGCPXAvp:new(level,group,l)
local t = NGCPXAvp.init(level,group,l) local t = NGCPXAvp.init(level,group,l)
NGCPXAvp_MT.__call = function(t, key, value) NGCPXAvp_MT.__call = function(s, key, value)
if not key then if not key then
error("key is empty") error("key is empty")
end end
local id = string.format("$xavp(%s[0]=>%s)", t.name, key) local id = string.format("$xavp(%s[0]=>%s)", s.name, key)
--print(string.format("id:%s", id)) --print(string.format("id:%s", id))
if not value then if not value then
return sr.pv.get(id) return sr.pv.get(id)
elseif type(value) == "number" then elseif type(value) == "number" then
table.add(t.keys, key) table.add(s.keys, key)
--sr.log("dbg", string.format("seti: [%s]:%d", id, value)) --sr.log("dbg", string.format("seti: [%s]:%d", id, value))
sr.pv.seti(id, value) sr.pv.seti(id, value)
elseif type(value) == "string" then elseif type(value) == "string" then
table.add(t.keys, key) table.add(s.keys, key)
--sr.log("dbg", string.format("sets: [%s]:%s", id, value)) --sr.log("dbg", string.format("sets: [%s]:%s", id, value))
sr.pv.sets(id, value) sr.pv.sets(id, value)
elseif type(value) == "table" then elseif type(value) == "table" then
table.add(t.keys, key) table.add(s.keys, key)
local i, v
for i = #value, 1, -1 do for i = #value, 1, -1 do
v = value[i] local v = value[i]
if type(v) == "number" then if type(v) == "number" then
sr.pv.seti(id, v) sr.pv.seti(id, v)
elseif type(v) == "string" then elseif type(v) == "string" then
@ -61,13 +60,12 @@ NGCPXAvp_MT = {
error("value is not a number or string") error("value is not a number or string")
end end
end end
NGCPXAvp_MT.__tostring = function (t) NGCPXAvp_MT.__tostring = function (s)
local l,k,v
local output local output
l = sr.xavp.get(t.name, 0) local ll = sr.xavp.get(s.name, 0)
if l then if ll then
output = table.tostring(l) output = table.tostring(ll)
end end
sr.log("dbg", string.format("output:%s", output)) sr.log("dbg", string.format("output:%s", output))
return output return output
@ -95,7 +93,7 @@ NGCPXAvp_MT = {
end end
function NGCPXAvp._setvalue(id, vtype, value) function NGCPXAvp._setvalue(id, vtype, value)
local check = nil local check
-- sr.log("info", string.format("vtype:[%s]:%d", type(vtype), vtype)) -- sr.log("info", string.format("vtype:[%s]:%d", type(vtype), vtype))
if type(vtype) == "string" then if type(vtype) == "string" then
vtype = tonumber(vtype) vtype = tonumber(vtype)
@ -119,7 +117,7 @@ NGCPXAvp_MT = {
check = sr.pv.get(id) check = sr.pv.get(id)
if check then if check then
if type(check) == 'table' then if type(check) == 'table' then
check = table.tostring(check) table.tostring(check)
end end
else else
--error(string.format("%s:nil", id)) --error(string.format("%s:nil", id))
@ -129,7 +127,6 @@ NGCPXAvp_MT = {
end end
function NGCPXAvp:_create(l) function NGCPXAvp:_create(l)
local i
local name = string.format("$xavp(%s=>dummy)", self.name) local name = string.format("$xavp(%s=>dummy)", self.name)
if not sr.pv.get(name) then if not sr.pv.get(name) then
NGCPXAvp._setvalue(name, 0, self.level) NGCPXAvp._setvalue(name, 0, self.level)

Write Preview
Loading…
Cancel
Save