martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More work on aqhome-react service.

Browse Source
This commit is contained in:
Martin Preuss
2024-03-25 23:18:18 +01:00
parent 02d12b4209
commit 50bdefcb4a
16 changed files with 725 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

316
apps/aqhome-react/net_read.c
View File

@@ -32,12 +32,20 @@
* ------------------------------------------------------------------------------------------------
*/
AQHREACT_UNIT_NET_LIST *_readUnitNetFiles(AQHOME_REACT *aqh, const GWEN_STRINGLIST *sl);
static int _readUnitNetFileToList(AQHOME_REACT *aqh, const char *sFilename, AQHREACT_UNIT_NET_LIST *unitNetList);
static AQHREACT_UNIT_NET_LIST *_readUnitNetFiles(AQHOME_REACT *aqh, const GWEN_STRINGLIST *sl);
static int _readAllNetworksFromFileIntoList(AQHOME_REACT *aqh, const char *sFilename, AQHREACT_UNIT_NET_LIST *unitNetList);
static GWEN_XMLNODE *_readNetworkFromSysconfIntoXml(AQHOME_REACT *aqh, const char *networkName);
static AQHREACT_UNIT_NET *_readUnitNetFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNetNode);
static GWEN_XMLNODE *_readUnitNetFileToXml(AQHOME_REACT *aqh, const char *sFilename);
static void _readNetParamDefsWithList(AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *unitNetNode);
static int _readUnits(AQHOME_REACT *aqh, AQHREACT_UNIT_NET *unitNet, GWEN_XMLNODE *unitNetNode);
static int _readLinks(AQHOME_REACT *aqh, AQHREACT_UNIT_NET *unitNet, GWEN_XMLNODE *unitNetNode);
static AQHREACT_UNIT *_readUnit(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNode);
static int _readParam(AQHREACT_UNIT *unit, GWEN_XMLNODE *n);
static int _readParamValuesForList(const AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *parentNode);
static int _readParamValueForList(const AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *paramNode);
static AQHREACT_PARAM *_readNetParamDef(GWEN_XMLNODE *paramNode);
static int _readLink(AQHOME_REACT *aqh, AQHREACT_UNIT_NET *unitNet, GWEN_XMLNODE *linkNode);
static int _setParamDoubleValueFromString(AQHREACT_PARAM *param, const char *s);
@@ -111,6 +119,37 @@ AQHREACT_UNIT_NET_LIST *AQHREACT_ReadUnitNetFiles(AQHOME_REACT *aqh)
GWEN_XMLNODE *_readNetworkFromSysconfIntoXml(AQHOME_REACT *aqh, const char *networkName)
{
GWEN_XMLNODE *n;
GWEN_BUFFER *bufFilename;
GWEN_BUFFER *bufPath;
bufFilename=GWEN_Buffer_new(0, 256, 0, 1);
GWEN_Buffer_AppendString(bufFilename, "aqhome/react/networks/");
GWEN_Buffer_AppendString(bufFilename, networkName);
GWEN_Buffer_AppendString(bufFilename, ".xml");
bufPath=AQH_FindPathOfSysconfFile(GWEN_Buffer_GetStart(bufFilename));
if (bufPath==NULL) {
DBG_ERROR(NULL, "Network file \"%s\" not found in sysconf folders", GWEN_Buffer_GetStart(bufFilename));
GWEN_Buffer_free(bufFilename);
return NULL;
}
GWEN_Buffer_free(bufFilename);
n=_readUnitNetFileToXml(aqh, GWEN_Buffer_GetStart(bufPath));
if (n==NULL) {
DBG_ERROR(NULL, "Error reading network file \"%s\" from sysconf dir", GWEN_Buffer_GetStart(bufPath));
GWEN_Buffer_free(bufPath);
return NULL;
}
GWEN_Buffer_free(bufPath);
return n;
}
AQHREACT_UNIT_NET_LIST *_readUnitNetFiles(AQHOME_REACT *aqh, const GWEN_STRINGLIST *sl)
{
GWEN_STRINGLISTENTRY *se;
@@ -126,7 +165,7 @@ AQHREACT_UNIT_NET_LIST *_readUnitNetFiles(AQHOME_REACT *aqh, const GWEN_STRINGLI
int rv;
DBG_INFO(NULL, "Reading unit network file \"%s\"", s);
rv=_readUnitNetFileToList(aqh, s, unitNetList);
rv=_readAllNetworksFromFileIntoList(aqh, s, unitNetList);
if (rv<0 && rv!=GWEN_ERROR_NO_DATA) {
DBG_WARN(NULL, "Error reading unit network file \"%s\" (%d), ignoring", s, rv);
}
@@ -144,7 +183,7 @@ AQHREACT_UNIT_NET_LIST *_readUnitNetFiles(AQHOME_REACT *aqh, const GWEN_STRINGLI
int _readUnitNetFileToList(AQHOME_REACT *aqh, const char *sFilename, AQHREACT_UNIT_NET_LIST *unitNetList)
int _readAllNetworksFromFileIntoList(AQHOME_REACT *aqh, const char *sFilename, AQHREACT_UNIT_NET_LIST *unitNetList)
{
GWEN_XMLNODE *rootNode;
GWEN_XMLNODE *netListNode;
@@ -185,12 +224,108 @@ AQHREACT_UNIT_NET *_readUnitNetFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNetN
{
AQHREACT_UNIT_NET *unitNet;
const char *s;
GWEN_XMLNODE *nGroup;
int rv;
unitNet=AQHREACT_UnitNet_new();
s=GWEN_XMLNode_GetProperty(unitNetNode, "id", NULL);
AQHREACT_UnitNet_SetName(unitNet, s);
s=GWEN_XMLNode_GetProperty(unitNetNode, "type", NULL);
if (s && *s) {
GWEN_XMLNODE *baseNetXml;
/* uses a template file, load that and only set params from non-template file */
DBG_INFO(NULL, "Loading base network \"%s\"", s);
baseNetXml=_readNetworkFromSysconfIntoXml(aqh, s);
if (baseNetXml==NULL) {
DBG_ERROR(NULL, "Base network \"%s\" not available (error or missing)", s);
AQHREACT_UnitNet_free(unitNet);
return NULL;
}
_readNetParamDefsWithList(AQHREACT_UnitNet_GetParamList(unitNet), baseNetXml);
/* also read netParams from this file (after reading from template) */
rv=_readParamValuesForList(AQHREACT_UnitNet_GetParamList(unitNet), unitNetNode);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_UnitNet_free(unitNet);
GWEN_XMLNode_free(baseNetXml);
return NULL;
}
rv=_readUnits(aqh, unitNet, baseNetXml);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_UnitNet_free(unitNet);
GWEN_XMLNode_free(baseNetXml);
return NULL;
}
rv=_readLinks(aqh, unitNet, baseNetXml);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_UnitNet_free(unitNet);
GWEN_XMLNode_free(baseNetXml);
return NULL;
}
GWEN_XMLNode_free(baseNetXml);
}
else {
/* just directly read network from given XML node (no need to load a template file) */
_readNetParamDefsWithList(AQHREACT_UnitNet_GetParamList(unitNet), unitNetNode);
rv=_readUnits(aqh, unitNet, unitNetNode);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_UnitNet_free(unitNet);
return NULL;
}
rv=_readLinks(aqh, unitNet, unitNetNode);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_UnitNet_free(unitNet);
return NULL;
}
}
return unitNet;
}
GWEN_XMLNODE *_readUnitNetFileToXml(AQHOME_REACT *aqh, const char *sFilename)
{
GWEN_XMLNODE *rootNode;
GWEN_XMLNODE *netNode;
int rv;
rootNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, NULL);
rv=GWEN_XML_ReadFile(rootNode, sFilename, GWEN_XML_FLAGS_DEFAULT);
if (rv<0) {
DBG_ERROR(NULL, "Error reading XML file \"%s\": %d", sFilename, rv);
GWEN_XMLNode_free(rootNode);
return NULL;
}
netNode=GWEN_XMLNode_FindFirstTag(rootNode, "network", NULL, NULL);
if (netNode) {
GWEN_XMLNode_UnlinkChild(rootNode, netNode);
GWEN_XMLNode_free(rootNode);
return netNode;
}
else {
DBG_ERROR(NULL, "No \"network\" element in network file \"%s\"", sFilename);
return NULL;
}
}
int _readUnits(AQHOME_REACT *aqh, AQHREACT_UNIT_NET *unitNet, GWEN_XMLNODE *unitNetNode)
{
GWEN_XMLNODE *nGroup;
nGroup=GWEN_XMLNode_FindFirstTag(unitNetNode, "units", NULL, NULL);
if (nGroup) {
GWEN_XMLNODE *n;
@@ -204,13 +339,21 @@ AQHREACT_UNIT_NET *_readUnitNetFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNetN
AQHREACT_UnitNet_AddUnit(unitNet, unit);
else {
DBG_ERROR(NULL, "Error reading unit in net \"%s\"", AQHREACT_UnitNet_GetName(unitNet));
AQHREACT_UnitNet_free(unitNet);
return NULL;
return GWEN_ERROR_BAD_DATA;
}
n=GWEN_XMLNode_FindNextTag(n, "unit", NULL, NULL);
}
}
return 0;
}
int _readLinks(AQHOME_REACT *aqh, AQHREACT_UNIT_NET *unitNet, GWEN_XMLNODE *unitNetNode)
{
GWEN_XMLNODE *nGroup;
nGroup=GWEN_XMLNode_FindFirstTag(unitNetNode, "links", NULL, NULL);
if (nGroup) {
GWEN_XMLNODE *n;
@@ -222,25 +365,22 @@ AQHREACT_UNIT_NET *_readUnitNetFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNetN
rv=_readLink(aqh, unitNet, n);
if (rv<0) {
DBG_ERROR(NULL, "Error reading link in net \"%s\" (%d)", AQHREACT_UnitNet_GetName(unitNet), rv);
AQHREACT_UnitNet_free(unitNet);
return NULL;
return GWEN_ERROR_BAD_DATA;
}
n=GWEN_XMLNode_FindNextTag(n, "link", NULL, NULL);
}
}
return unitNet;
return 0;
}
AQHREACT_UNIT *_readUnit(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNode)
{
AQHREACT_UNIT *unit;
const char *unitType;
const char *unitId;
GWEN_XMLNODE *nGroup;
int rv;
unitType=GWEN_XMLNode_GetProperty(unitNode, "type", NULL);
if (!(unitType && *unitType)) {
@@ -252,22 +392,11 @@ AQHREACT_UNIT *_readUnit(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNode)
unitId=GWEN_XMLNode_GetProperty(unitNode, "id", NULL);
AQHREACT_Unit_SetId(unit, unitId);
nGroup=GWEN_XMLNode_FindFirstTag(unitNode, "params", NULL, NULL);
if (nGroup) {
GWEN_XMLNODE *n;
n=GWEN_XMLNode_FindFirstTag(nGroup, "param", NULL, NULL);
while(n) {
int rv;
rv=_readParam(unit, n);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_Unit_free(unit);
return NULL;
}
n=GWEN_XMLNode_FindNextTag(n, "param", NULL, NULL);
}
rv=_readParamValuesForList(AQHREACT_Unit_GetParamList(unit), unitNode);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_Unit_free(unit);
return NULL;
}
return unit;
@@ -275,7 +404,32 @@ AQHREACT_UNIT *_readUnit(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNode)
int _readParam(AQHREACT_UNIT *unit, GWEN_XMLNODE *paramNode)
int _readParamValuesForList(const AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *parentNode)
{
GWEN_XMLNODE *nGroup;
nGroup=GWEN_XMLNode_FindFirstTag(parentNode, "params", NULL, NULL);
if (nGroup) {
GWEN_XMLNODE *n;
n=GWEN_XMLNode_FindFirstTag(nGroup, "param", NULL, NULL);
while(n) {
int rv;
rv=_readParamValueForList(paramList, n);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
return rv;
}
n=GWEN_XMLNode_FindNextTag(n, "param", NULL, NULL);
}
}
return 0;
}
int _readParamValueForList(const AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *paramNode)
{
const char *paramName;
@@ -283,7 +437,7 @@ int _readParam(AQHREACT_UNIT *unit, GWEN_XMLNODE *paramNode)
if (paramName && *paramName) {
AQHREACT_PARAM *param;
param=AQHREACT_Unit_GetParamByName(unit, paramName);
param=AQHREACT_Param_List_GetParamByName(paramList, paramName);
if (param) {
const char *value;
@@ -300,7 +454,7 @@ int _readParam(AQHREACT_UNIT *unit, GWEN_XMLNODE *paramNode)
rv=GWEN_Text_StringToDouble(value, &valueAsDouble);
if (rv<0) {
DBG_ERROR(NULL, "Not a DOUBLE value for param %s in unit %s [%s]", paramName, AQHREACT_Unit_GetId(unit), value);
DBG_ERROR(NULL, "Not a DOUBLE value for param %s in list [%s]", paramName, value);
return rv;
}
AQHREACT_Param_SetDoubleValue(param, valueAsDouble);
@@ -314,7 +468,7 @@ int _readParam(AQHREACT_UNIT *unit, GWEN_XMLNODE *paramNode)
}
}
else {
DBG_ERROR(NULL, "No param name \"%s\" in unit %s", paramName, AQHREACT_Unit_GetId(unit));
DBG_ERROR(NULL, "No param name \"%s\" in list", paramName);
return GWEN_ERROR_BAD_DATA;
}
}
@@ -324,6 +478,100 @@ int _readParam(AQHREACT_UNIT *unit, GWEN_XMLNODE *paramNode)
void _readNetParamDefsWithList(AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *unitNetNode)
{
GWEN_XMLNODE *nGroup;
nGroup=GWEN_XMLNode_FindFirstTag(unitNetNode, "params", NULL, NULL);
if (nGroup) {
GWEN_XMLNODE *n;
n=GWEN_XMLNode_FindFirstTag(nGroup, "param", NULL, NULL);
while(n) {
AQHREACT_PARAM *param;
param=_readNetParamDef(n);
if (param)
AQHREACT_Param_List_Add(param, paramList);
n=GWEN_XMLNode_FindNextTag(n, "param", NULL, NULL);
}
}
}
AQHREACT_PARAM *_readNetParamDef(GWEN_XMLNODE *paramNode)
{
const char *paramName;
const char *paramType;
const char *paramValue;
paramName=GWEN_XMLNode_GetProperty(paramNode, "name", NULL);
paramType=GWEN_XMLNode_GetProperty(paramNode, "type", "string");
paramValue=GWEN_XMLNode_GetCharValue(paramNode, NULL, NULL);
if (paramName && *paramName) {
int t=AQHREACT_DATAOBJECTTYPE_STRING;
AQHREACT_PARAM *param;
if (paramType) {
if (strcasecmp(paramType, "string")==0)
t=AQHREACT_DATAOBJECTTYPE_STRING;
else if (strcasecmp(paramType, "double")==0)
t=AQHREACT_DATAOBJECTTYPE_DOUBLE;
else {
DBG_ERROR(NULL, "Invalid data type in parameter (%s), assuming string", paramType);
t=AQHREACT_DATAOBJECTTYPE_STRING;
}
}
param=AQHREACT_Param_new();
AQHREACT_Param_SetName(param, paramName);
AQHREACT_Param_SetDataType(param, t);
if (paramValue && *paramValue) {
int rv;
switch(t) {
case AQHREACT_DATAOBJECTTYPE_STRING:
AQHREACT_Param_SetStringValue(param, paramValue);
break;
case AQHREACT_DATAOBJECTTYPE_DOUBLE:
rv=_setParamDoubleValueFromString(param, paramValue);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
AQHREACT_Param_free(param);
return NULL;
}
break;
default:
break;
}
}
return param;
}
return NULL;
}
int _setParamDoubleValueFromString(AQHREACT_PARAM *param, const char *s)
{
int rv;
double value;
rv=GWEN_Text_StringToDouble(s, &value);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
return rv;
}
AQHREACT_Param_SetDoubleValue(param, value);
return 0;
}
int _readLink(AQHOME_REACT *aqh, AQHREACT_UNIT_NET *unitNet, GWEN_XMLNODE *linkNode)
{
const char *sourceUnitName;