diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2013-10-27 01:43:30 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2013-10-27 01:43:30 +0000 |
| commit | 148d568b3db38ada9cf0c5085d2c71584d588598 (patch) | |
| tree | 681681965b7089d49121356a367f39f01c661f05 /config/process_put.lua | |
| parent | 24e737f23a7ef3a5f5871d75a23470d6ee27462e (diff) | |
| download | acf-provisioning-148d568b3db38ada9cf0c5085d2c71584d588598.tar.bz2 acf-provisioning-148d568b3db38ada9cf0c5085d2c71584d588598.tar.xz | |
Revert "Change function prototypes to pass self and use self.model instead of functions table"
This reverts commit fb00ff8f05dae3c110beceb929ea036e4cd14ae1.
Conflicts:
provisioning-model.lua
Conflict was resolved by removing "mymodule." from function calls that are once again made local
Diffstat (limited to 'config/process_put.lua')
| -rw-r--r-- | config/process_put.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/process_put.lua b/config/process_put.lua index 1a34042..4eabb1a 100644 --- a/config/process_put.lua +++ b/config/process_put.lua @@ -1,10 +1,10 @@ -- This is the script run to process uploaded config files -local self, mac, data, device_id = ... +local functions, mac, data, device_id = ... ---self.logevent("got to process_put script") +--APP.logevent("got to process_put script") -- Get the params -local params = self.get_device_params(self, device_id) +local params = functions.get_device_params(device_id) function process_polycom() local before, xml, after = string.match(data, "(.*<OVERRIDES)([^/]*)(/>.*)") @@ -18,7 +18,7 @@ function process_polycom() end -- for n,v in pairs(attrs) do --- self.logevent("name "..n.." val "..(v or "")) +-- APP.logevent("name "..n.." val "..(v or "")) -- end -- Read attributes from attrs and generate paramaters for ACF @@ -57,7 +57,7 @@ if string.match(params.value.device.label, "Polycom") then end -- Update the params -local params = self.set_device_params(self, params) +local params = functions.set_device_params(params) -- Return the updated data return data |