From 81f018aad99c5660acd7d80c7338d938808f0dd9 Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Tue, 10 Feb 2009 15:10:44 +0000
Subject: [PATCH] Bug1164: or conditions between hooks
---
MAC/Navigator2/scripts/monitorStateReset.ctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAC/Navigator2/scripts/monitorStateReset.ctl b/MAC/Navigator2/scripts/monitorStateReset.ctl
index 4ba0226f19e..9a0dfa158bf 100644
--- a/MAC/Navigator2/scripts/monitorStateReset.ctl
+++ b/MAC/Navigator2/scripts/monitorStateReset.ctl
@@ -351,7 +351,7 @@ bool setStates(string DP,int state, int originatorState,string message) {
}
bool setChildStates(string DP,int state, int originatorState, string message) {
- string query = "SELECT '_online.._value' FROM '" + DP + "*.**.status.childState' WHERE '.status.leaf:_online.._value' == 0 AND '.status.childState:_online.._value' < " + state + " OR '.status.childState:_online.._value' == "+OPERATIONAL+ " OR '.status.childState:_online.._value' == "+originatorState;
+ string query = "SELECT '_online.._value' FROM '" + DP + "*.**.status.childState' WHERE '.status.leaf:_online.._value' == 0 AND ('.status.childState:_online.._value' < " + state + " OR '.status.childState:_online.._value' == "+OPERATIONAL+ " OR '.status.childState:_online.._value' == "+originatorState+")";
if (bDebug) DebugN("monitorStateResets.ctl:setChildStates|composed statequery: "+query);
dyn_dyn_anytype tab;
--
GitLab