linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- removed temporarely the "OK: ... " message on update

Browse Source
This commit is contained in:
zolliker
2009-02-19 16:11:42 +00:00
parent 35f2b6b810
commit 794f5cf29a
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scriptcontext.c
View File

@ -369,7 +369,7 @@ static char *SctActionHandler(void *actionData, char *lastReply,
state = result; state = result;
if (strcasecmp(state, "idle") == 0 || strcasecmp(state, "unpoll") == 0) { if (strcasecmp(state, "idle") == 0 || strcasecmp(state, "unpoll") == 0) {
if (queueData == data && !data->answered) { if (queueData == data && !data->answered) {
SCWrite(con, "o.k.", eStatus); SCWrite(con, "o.k.", eWarning);
} }
snprintf(eprop, sizeof eprop, "error_during_%s", data->name); snprintf(eprop, sizeof eprop, "error_during_%s", data->name);
emsg = GetHdbProp(node, eprop); emsg = GetHdbProp(node, eprop);
@ -382,7 +382,7 @@ static char *SctActionHandler(void *actionData, char *lastReply,
} }
snprintf(timeKey, sizeof timeKey, "%s_time", data->name); snprintf(timeKey, sizeof timeKey, "%s_time", data->name);
snprintf(timeVal, sizeof timeVal, "%.3f", DoubleTime()); snprintf(timeVal, sizeof timeVal, "%.3f", DoubleTime());
SetHdbProperty(data->node, timeKey, timeVal); SetHdbProperty(node, timeKey, timeVal);
send = NULL; send = NULL;
goto finish; goto finish;
} }
@ -400,10 +400,7 @@ static char *SctActionHandler(void *actionData, char *lastReply,
SCPrintf(con, eLogError, "ERROR: too many quick scripts chained"); SCPrintf(con, eLogError, "ERROR: too many quick scripts chained");
finish: finish:
if (strcmp(data->name, "write") == 0) { if (strcmp(data->name, "write") == 0) {
/* check if it would be ok to do this only when writestatus property exists: SetProp(node, controller->node, "writestatus", "commandsent");
GetHdbProp(data->node, "writestatus") != NULL
*/
SetHdbProperty(data->node, "writestatus", "commandsent");
} }
if (strcasecmp(state, "unpoll") == 0) { if (strcasecmp(state, "unpoll") == 0) {
DevUnschedule(controller->devser, data, SctActionHandler, SctMatch); DevUnschedule(controller->devser, data, SctActionHandler, SctMatch);
@ -588,15 +585,13 @@ static hdbCallbackReturn SctActionCallback(Hdb * node, void *userData,
if (mm != NULL) { if (mm != NULL) {
if (queueData != NULL && queueData->conCtx != NULL && !data->answered) { if (queueData != NULL && queueData->conCtx != NULL && !data->answered) {
/* update called from a write action */ /* update called from a write action */
/*
data->answered = 1; data->answered = 1;
GetHdbPath(node, path, sizeof path); GetHdbPath(node, path, sizeof path);
text = formatValue(*(mm->v), node); text = formatValue(*(mm->v), node);
/* Markus: who is receiving this message? SCPrintf(queueData->conCtx, eWarning, "OK: %s set to: %s", path, GetCharArray(text));
It gave unwanted output to me. MK
Answer: a commandline client -> outcode eStatus correct?
*/
SCPrintf(queueData->conCtx, eStatus, "%s = %s", path, GetCharArray(text));
DeleteDynString(text); DeleteDynString(text);
*/
} }
return hdbContinue; return hdbContinue;
} }