In RequestDownload method, read manufacturer and product class from _deviceId struct rather than InternetGatewayDevice.DeviceInfo object.

This commit is contained in:
Zaid Abdulla committed 2014-02-04 23:30:35 +03:00
1 parent 589d8899cc
commit 603bae83a2
1 file changed
+4 -4
+4 -4
View File
@@ -436,13 +436,13 @@ listener = (httpRequest, httpResponse) ->
currentSoftwareVersion = devicePreset.softwareVersion?.current._value currentSoftwareVersion = devicePreset.softwareVersion?.current._value
if presetSoftwareVersion? and presetSoftwareVersion != currentSoftwareVersion if presetSoftwareVersion? and presetSoftwareVersion != currentSoftwareVersion
projection = { projection = {
'InternetGatewayDevice.DeviceInfo.Manufacturer' : 1, '_deviceId._Manufacturer' : 1,
'InternetGatewayDevice.DeviceInfo.ProductClass' : 1, '_deviceId._ProductClass' : 1,
} }
db.devicesCollection.findOne({'_id' : currentRequest.deviceId}, projection, (err, device) -> db.devicesCollection.findOne({'_id' : currentRequest.deviceId}, projection, (err, device) ->
throw err if err throw err if err
manufacturer = device.InternetGatewayDevice.DeviceInfo.Manufacturer._value manufacturer = device._deviceId._Manufacturer
productClass = device.InternetGatewayDevice.DeviceInfo.ProductClass._value productClass = device._deviceId._ProductClass
db.filesCollection.findOne({'metadata.fileType' : '1 Firmware Upgrade Image', 'metadata.manufacturer' : manufacturer, 'metadata.productClass' : productClass, 'metadata.version' : presetSoftwareVersion}, {_id : 1}, (err, file) -> db.filesCollection.findOne({'metadata.fileType' : '1 Firmware Upgrade Image', 'metadata.manufacturer' : manufacturer, 'metadata.productClass' : productClass, 'metadata.version' : presetSoftwareVersion}, {_id : 1}, (err, file) ->
throw err if err throw err if err
if not file? if not file?