Remove Active Filter

DreamsAndAdventures · Jan 14, 2025 · 07c3e9d · 07c3e9d
1 parent 07d4fc6
commit 07c3e9d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 39 deletions.
diff --git a/Libraries/Opc.Ua.Server/Subscription/MonitoredItem.cs b/Libraries/Opc.Ua.Server/Subscription/MonitoredItem.cs
@@ -1132,12 +1132,7 @@ protected bool CanSendFilteredAlarm(FilterContext context, EventFilter filter, I
 
                 if ( passedFilter )
                 {
-                    // Archie - December 17 2024
-                    // Requires discussion with Part 9 Editor
-                    // if (alarmCondition.Retain.Value)
-                    {
-                        conditionIds.Add(key);
-                    }
+                    conditionIds.Add(key);
                 }
                 else
                 {

diff --git a/Tests/Opc.Ua.Server.Tests/FilterRetainTests.cs b/Tests/Opc.Ua.Server.Tests/FilterRetainTests.cs
@@ -1,8 +1,4 @@
 
-// Archie - December 17 2024
-// Requires discussion with Part 9 Editor
-#define AddActiveState
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -507,35 +503,6 @@ private ContentFilter GetStateFilter()
 
             #endregion
 
-#if AddActiveState
-
-            #region Add Active State
-
-            #region Active Index 0
-
-            SimpleAttributeOperand activeState = new SimpleAttributeOperand() {
-                AttributeId = Attributes.Value,
-                TypeDefinitionId = null,
-                BrowsePath = new QualifiedNameCollection(new QualifiedName[] {
-                    BrowseNames.ActiveState })
-            };
-
-            LiteralOperand activeValue = new LiteralOperand();
-            activeValue.Value = new Variant(Active);
-
-            whereClause.Push(FilterOperator.Equals, new FilterOperand[] {
-                activeState,
-                activeValue });
-
-            #endregion
-
-            whereClause.Push(FilterOperator.And, new ElementOperand[] {
-                new ElementOperand(1),
-                new ElementOperand(2) });
-
-            #endregion
-#endif
-
             whereClause.Push(FilterOperator.And, new ElementOperand[] {
                 new ElementOperand(0),
                 new ElementOperand(1) });