diff --git a/lib/presets.coffee b/lib/presets.coffee index ffc6805..df800a9 100644 --- a/lib/presets.coffee +++ b/lib/presets.coffee @@ -155,15 +155,7 @@ exports.getDevicePreset = (deviceId, presets, objects, aliases, callback) -> devicePreset.objects[c.name][c.object].current ?= {} for k,p of param continue if k[0] == '_' - if p._name? - if p._name == c.object - devicePreset.objects[c.name][c.object].current[k] = p - else if matchObject(objects[c.object], p) - u = {} - u["#{c.name}.#{k}._name"] = c.object - db.devicesCollection.update({'_id' : deviceId}, {'$set' : u}, {}, (err, count) -> - throw err if err - ) + if matchObject(objects[c.object], p) devicePreset.objects[c.name][c.object].current[k] = p when 'delete_object' @@ -174,15 +166,7 @@ exports.getDevicePreset = (deviceId, presets, objects, aliases, callback) -> devicePreset.objects[c.name][c.object].current ?= {} for k,p of param continue if k[0] == '_' - if p._name? - if p._name == c.object - devicePreset.objects[c.name][c.object].current[k] = p - else if matchObject(objects[c.object], p) - u = {} - u["#{c.name}.#{k}._name"] = c.object - db.devicesCollection.update({'_id' : deviceId}, {'$set' : u}, {}, (err, count) -> - throw err if err - ) + if matchObject(objects[c.object], p) devicePreset.objects[c.name][c.object].current[k] = p when 'custom_command_value' @@ -273,7 +257,7 @@ exports.processDevicePreset = (deviceId, devicePreset, callback) -> vals = [] for k,v of flatObject vals.push([k, v]) if k[0] != '_' - taskList.push({device : deviceId, name : 'addObject', objectName : parameterPath, parameterValues : vals, instanceName : objectName}) + taskList.push({device : deviceId, name : 'addObject', objectName : parameterPath, parameterValues : vals}) else if Object.keys(objectDetails.current).length > 0 for i, obj of objectDetails.current taskList.push({device : deviceId, name : 'deleteObject', objectName : "#{parameterPath}.#{i}"}) diff --git a/lib/tasks.coffee b/lib/tasks.coffee index a75b3b6..8860c4f 100644 --- a/lib/tasks.coffee +++ b/lib/tasks.coffee @@ -221,7 +221,6 @@ this.addObject = (task, methodResponse, callback) -> task.session.subtask = {device : task.device, name : 'getParameterNames', parameterPath : "#{task.objectName}.#{task.session.instanceNumber}.", nextLevel : false} task.session.appliedParameterValues = [] task.session.parameterNames = [] - allDeviceUpdates.instanceName = [["#{task.objectName}.#{task.session.instanceNumber}", task.instanceName]] if task.instanceName? else callback(null, STATUS_OK, {type : 'AddObject', objectName : "#{task.objectName}."}) return @@ -297,7 +296,7 @@ this.reboot = (task, methodResponse, callback) -> task.fault = methodResponse callback(null, STATUS_FAULT) return - + if methodResponse.type isnt 'RebootResponse' callback(null, STATUS_OK, {type : 'Reboot'}) else diff --git a/lib/update-device.coffee b/lib/update-device.coffee index 713abbd..5c5d9d9 100644 --- a/lib/update-device.coffee +++ b/lib/update-device.coffee @@ -75,10 +75,6 @@ commitUpdates = (deviceId, deviceUpdates, commitQueue, callback) -> for p in updatesBatch.deletedObjects update['$unset'][p] = 1 - if updatesBatch.instanceName? - for i in updatesBatch.instanceName - update['$set']["#{i[0]}._name"] = i[1] - if updatesBatch.parameterNames? presentPaths ?= {} projection ?= {}