From 83cdc8abe3cc8612f3bef52da9b215830c739e7f Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Fri, 12 Apr 2024 22:41:36 +0200 Subject: [PATCH] aqhome-react: switch locations of template files and system network files. - template files are stored in $PATH/share/aqhome/react/networks - system network files are in $PATH/etc/aqhome/react/networks --- apps/aqhome-react/net_read.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/aqhome-react/net_read.c b/apps/aqhome-react/net_read.c index f34672c..a0cbdb5 100644 --- a/apps/aqhome-react/net_read.c +++ b/apps/aqhome-react/net_read.c @@ -35,7 +35,7 @@ static time_t _getNewestFiletimeFromFileList(const AQHOME_REACT *aqh, const GWEN_STRINGLIST *sl); 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 GWEN_XMLNODE *_readNetworkFromDatadirIntoXml(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); @@ -80,7 +80,7 @@ AQHREACT_UNIT_NET_LIST *AQHomeReact_ReadUnitNetFiles(AQHOME_REACT *aqh) { GWEN_STRINGLIST *sl; - sl=AQH_GetListOfMatchingDataFiles("aqhome/react/networks", "*.xml"); + sl=AQH_GetListOfMatchingSysconfFiles("aqhome/react/networks", "*.xml"); if (sl) { AQHREACT_UNIT_NET_LIST *unitNetList; @@ -134,7 +134,7 @@ time_t _getNewestFiletimeFromFileList(const AQHOME_REACT *aqh, const GWEN_STRING -GWEN_XMLNODE *_readNetworkFromSysconfIntoXml(AQHOME_REACT *aqh, const char *networkName) +GWEN_XMLNODE *_readNetworkFromDatadirIntoXml(AQHOME_REACT *aqh, const char *networkName) { GWEN_XMLNODE *n; GWEN_BUFFER *bufFilename; @@ -145,7 +145,7 @@ GWEN_XMLNODE *_readNetworkFromSysconfIntoXml(AQHOME_REACT *aqh, const char *netw GWEN_Buffer_AppendString(bufFilename, networkName); GWEN_Buffer_AppendString(bufFilename, ".xml"); - bufPath=AQH_FindPathOfSysconfFile(GWEN_Buffer_GetStart(bufFilename)); + bufPath=AQH_FindPathOfDataFile(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); @@ -252,7 +252,7 @@ AQHREACT_UNIT_NET *_readUnitNetFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNetN /* 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); + baseNetXml=_readNetworkFromDatadirIntoXml(aqh, s); if (baseNetXml==NULL) { DBG_ERROR(NULL, "Base network \"%s\" not available (error or missing)", s); AQHREACT_UnitNet_free(unitNet);