diff options
author | Ted Trask <ttrask01@yahoo.com> | 2012-06-20 15:53:03 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2013-05-25 12:36:14 +0000 |
commit | 65382272223922a0cc67a1e7e74610fbf0a980a1 (patch) | |
tree | fc33c811913b2356acc135af0300e06bc7f44bcc | |
parent | 6ec4d53a6c8faf536f75bf6159aa671ae230c48c (diff) | |
download | acf-provisioning-65382272223922a0cc67a1e7e74610fbf0a980a1.tar.bz2 acf-provisioning-65382272223922a0cc67a1e7e74610fbf0a980a1.tar.xz |
Fix process_put string.match statement
(cherry picked from commit e0418d6d350a188687fab672c7c213dc87207d5b)
-rw-r--r-- | config/process_put.lua | 2 | ||||
-rw-r--r-- | config/templates/polycom-template.lua | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/process_put.lua b/config/process_put.lua index 0a3b8bc..33e918a 100644 --- a/config/process_put.lua +++ b/config/process_put.lua @@ -7,7 +7,7 @@ APP.logevent("got to process_put script") local params = functions.get_device_params(device_id) function process_polycom() - local before, xml, after = string.match(data, "(.*<OVERRIDES )([^/]*)( />.*)") + local before, xml, after = string.match(data, "(.*<OVERRIDES)([^/]*)(/>.*)") if not xml then return end local attrs = {} for str in string.gmatch(xml, "%S+") do diff --git a/config/templates/polycom-template.lua b/config/templates/polycom-template.lua index 9751ef8..db01510 100644 --- a/config/templates/polycom-template.lua +++ b/config/templates/polycom-template.lua @@ -228,7 +228,6 @@ for pg, pg_t in pairs(values) do -- set forwardnoanswer as defined xml_attr({ 'reg', num, 'fwd.noanswer.status' }, pg_t.forwardnoanswerenable) xml_attr({ 'reg', num, 'fwd.noanswer.contact' }, pg_t.forwardnoanswer) - xml_attr({ 'reg', num, 'fwd.noanswer.ringCount' }, '3') -- we do not use 'divert.noanswer.x.timeout', -- because it limits maximum rings *even when* forward-on-noanswer disabled |