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

aqhome-react: switch locations of template files and system network files.

Browse Source 
- template files are stored in $PATH/share/aqhome/react/networks
- system network files are in $PATH/etc/aqhome/react/networks
This commit is contained in:
Martin Preuss
2024-04-12 22:41:36 +02:00
parent 2653b16939
commit 83cdc8abe3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@
static time_t _getNewestFiletimeFromFileList(const AQHOME_REACT *aqh, const GWEN_STRINGLIST *sl); 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 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 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 AQHREACT_UNIT_NET *_readUnitNetFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *unitNetNode);
static GWEN_XMLNODE *_readUnitNetFileToXml(AQHOME_REACT *aqh, const char *sFilename); static GWEN_XMLNODE *_readUnitNetFileToXml(AQHOME_REACT *aqh, const char *sFilename);
static void _readNetParamDefsWithList(AQHREACT_PARAM_LIST *paramList, GWEN_XMLNODE *unitNetNode); 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; GWEN_STRINGLIST *sl;
sl=AQH_GetListOfMatchingDataFiles("aqhome/react/networks", "*.xml"); sl=AQH_GetListOfMatchingSysconfFiles("aqhome/react/networks", "*.xml");
if (sl) { if (sl) {
AQHREACT_UNIT_NET_LIST *unitNetList; 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_XMLNODE *n;
GWEN_BUFFER *bufFilename; 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, networkName);
GWEN_Buffer_AppendString(bufFilename, ".xml"); GWEN_Buffer_AppendString(bufFilename, ".xml");
bufPath=AQH_FindPathOfSysconfFile(GWEN_Buffer_GetStart(bufFilename)); bufPath=AQH_FindPathOfDataFile(GWEN_Buffer_GetStart(bufFilename));
if (bufPath==NULL) { if (bufPath==NULL) {
DBG_ERROR(NULL, "Network file \"%s\" not found in sysconf folders", GWEN_Buffer_GetStart(bufFilename)); DBG_ERROR(NULL, "Network file \"%s\" not found in sysconf folders", GWEN_Buffer_GetStart(bufFilename));
GWEN_Buffer_free(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 */ /* uses a template file, load that and only set params from non-template file */
DBG_INFO(NULL, "Loading base network \"%s\"", s); DBG_INFO(NULL, "Loading base network \"%s\"", s);
baseNetXml=_readNetworkFromSysconfIntoXml(aqh, s); baseNetXml=_readNetworkFromDatadirIntoXml(aqh, s);
if (baseNetXml==NULL) { if (baseNetXml==NULL) {
DBG_ERROR(NULL, "Base network \"%s\" not available (error or missing)", s); DBG_ERROR(NULL, "Base network \"%s\" not available (error or missing)", s);
AQHREACT_UnitNet_free(unitNet); AQHREACT_UnitNet_free(unitNet);