Openzwave, forcing getting product id/type when not set on new value update

Author: gizmocuz

hardware/OpenZWave.cpp

@@ -547,7 +547,7 @@ void COpenZWave::OnZWaveNotification(OpenZWave::Notification const* _notificatio
 		{
 			// Add the new value to our list
 
-			if (nodeInfo->Manufacturer_id.empty())
+			if (nodeInfo->Manufacturer_name.empty())
 			{
 				nodeInfo->Manufacturer_id = pManager->GetNodeManufacturerId(_homeID, _nodeID);
 				nodeInfo->Manufacturer_name = pManager->GetNodeManufacturerName(_homeID, _nodeID);
@@ -2579,6 +2579,34 @@ void COpenZWave::UpdateValue(const OpenZWave::ValueID &vID)
 	pDevice->orgInstanceID = vOrgInstance;
 	pDevice->orgIndexID = vOrgIndex;
 
+	if (
+		(pDevice->Manufacturer_id == 0) &&
+		(pDevice->Product_id == 0) &&
+		(pDevice->Product_type == 0)
+		)
+	{
+		COpenZWave::NodeInfo *pNode = GetNodeInfo(HomeID, NodeID);
+		if (pNode)
+		{
+			if (!pNode->Manufacturer_name.empty())
+			{
+				int xID;
+				std::stringstream ss;
+				ss << std::hex << pNode->Manufacturer_id;
+				ss >> xID;
+				pDevice->Manufacturer_id = xID;
+				std::stringstream ss2;
+				ss2 << std::hex << pNode->Product_id;
+				ss2 >> xID;
+				pDevice->Product_id = xID;
+				std::stringstream ss3;
+				ss3 << std::hex << pNode->Product_type;
+				ss3 >> xID;
+				pDevice->Product_type = xID;
+			}
+		}
+	}
+
 	switch (pDevice->devType)
 	{
 	case ZDTYPE_SWITCH_NORMAL:

main/WebServer.cpp

@@ -7248,7 +7248,7 @@ namespace http {
 							" A.Protected, B.XOffset, B.YOffset, B.PlanID, A.Description"
 							" FROM Scenes as A"
 							" LEFT OUTER JOIN DeviceToPlansMap as B ON (B.DeviceRowID==a.ID) AND (B.DevSceneType==1)"
-							" ORDER BY %s",
+							" ORDER BY %q",
 							szOrderBy);
 
 					if (result.size() > 0)
@@ -7429,7 +7429,7 @@ namespace http {
 						" A.Options "
 						"FROM DeviceStatus as A LEFT OUTER JOIN DeviceToPlansMap as B "
 						"ON (B.DeviceRowID==a.ID) AND (B.DevSceneType==0) "
-						"ORDER BY %s",
+						"ORDER BY %q",
 						szOrderBy);
 				}
 			}
@@ -7530,7 +7530,7 @@ namespace http {
 						"FROM DeviceStatus as A, SharedDevices as B "
 						"LEFT OUTER JOIN DeviceToPlansMap as C  ON (C.DeviceRowID==A.ID)"
 						"WHERE (B.DeviceRowID==A.ID)"
-						" AND (B.SharedUserID==%lu) ORDER BY %s",
+						" AND (B.SharedUserID==%lu) ORDER BY %q",
 						m_users[iUser].ID, szOrderBy);
 				}
 			}