Fixed attribute value search NOT_EQUALS searching historically versus only current value

2 files changed, 11 insertions, 13 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamVersionWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamVersionWorldSearchItem.java
index ad4b4e434a1..3b8ee8ea08c 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamVersionWorldSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamVersionWorldSearchItem.java
@@ -114,7 +114,7 @@ public class TeamVersionWorldSearchItem extends WorldSearchItem {
       Set<TeamDefinitionArtifact> srchTeamDefs = new HashSet<TeamDefinitionArtifact>();
       for (TeamDefinitionArtifact teamDef : (teamDefs != null ? teamDefs : selectedTeamDefs))
          srchTeamDefs.add(teamDef);
-      if (recurseChildren) {
+      if (selectedRecurseChildren) {
          for (TeamDefinitionArtifact teamDef : (teamDefs != null ? teamDefs : selectedTeamDefs)) {
             Artifacts.getChildrenOfType(teamDef, srchTeamDefs, TeamDefinitionArtifact.class, true);
          }
@@ -150,7 +150,7 @@ public class TeamVersionWorldSearchItem extends WorldSearchItem {
       allProductCriteria.add(teamWorkflowSearch);
       if (selectedVersion != null) allProductCriteria.add(new InRelationSearch(versionWorkflowSearch,
             RelationSide.TeamWorkflowTargetedForVersion_Workflow));
-      if (!showFinished) {
+      if (!selectedShowFinished) {
          allProductCriteria.add(new AttributeValueSearch(ATSAttributes.CURRENT_STATE_ATTRIBUTE.getStoreName(),
                DefaultTeamState.Cancelled.name() + ";;;", Operator.NOT_EQUAL));
          allProductCriteria.add(new AttributeValueSearch(ATSAttributes.CURRENT_STATE_ATTRIBUTE.getStoreName(),
@@ -162,7 +162,7 @@ public class TeamVersionWorldSearchItem extends WorldSearchItem {
       }
       FromArtifactsSearch allTeamWorkflows = new FromArtifactsSearch(allProductCriteria, true);
 
-      if (!showAction) {
+      if (!selectedShowAction) {
          if (isCancelled()) return EMPTY_SET;
          Collection<Artifact> arts =
                ArtifactPersistenceManager.getInstance().getArtifacts(allProductCriteria, true,
@@ -183,6 +183,10 @@ public class TeamVersionWorldSearchItem extends WorldSearchItem {
       return arts;
    }
 
+   boolean selectedShowFinished = false;
+   boolean selectedShowAction = false;
+   boolean selectedRecurseChildren = false;
+
    @Override
    public void performUI(SearchType searchType) {
       super.performUI(searchType);
@@ -195,10 +199,10 @@ public class TeamVersionWorldSearchItem extends WorldSearchItem {
       diag.setRecurseChildren(recurseChildren);
       int result = diag.open();
       if (result == 0) {
-         showFinished = diag.isShowFinished();
-         showAction = diag.isShowAction();
+         selectedShowFinished = diag.isShowFinished();
+         selectedShowAction = diag.isShowAction();
+         selectedRecurseChildren = diag.isRecurseChildren();
          selectedVersion = diag.getSelectedVersion();
-         recurseChildren = diag.isRecurseChildren();
          if (selectedTeamDefs == null)
             selectedTeamDefs = new HashSet<TeamDefinitionArtifact>();
          else
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java
index 374e6cdbf36..624c3f4f5fb 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java
@@ -11,7 +11,6 @@
 package org.eclipse.osee.framework.skynet.core.artifact.search;
 
 import static org.eclipse.osee.framework.skynet.core.artifact.search.Operator.IS;
-import static org.eclipse.osee.framework.skynet.core.artifact.search.Operator.NOT_EQUAL;
 import static org.eclipse.osee.framework.ui.plugin.util.db.schemas.SkynetDatabase.ATTRIBUTE_TYPE_TABLE;
 import static org.eclipse.osee.framework.ui.plugin.util.db.schemas.SkynetDatabase.ATTRIBUTE_VERSION_TABLE;
 import static org.eclipse.osee.framework.ui.plugin.util.db.schemas.SkynetDatabase.TRANSACTIONS_TABLE;
@@ -99,12 +98,7 @@ public class AttributeValueSearch implements ISearchPrimitive {
       dataList.add(branch.getBranchId());
 
       if (attributeValue != null) {
-         if (operator == NOT_EQUAL) {
-            sql +=
-                  " AND NOT EXISTS " + "(SELECT 'x' FROM " + ATTRIBUTE_ALIAS_3 + " WHERE " + ATTRIBUTE_ALIAS_3.column("art_id") + "=" + ATTRIBUTE_ALIAS_1.column("art_id") + " AND " + ATTRIBUTE_ALIAS_3.column("value") + "=?)";
-         } else {
-            sql += " AND " + ATTRIBUTE_ALIAS_1.column("value") + operator + " ?";
-         }
+         sql += " AND " + ATTRIBUTE_ALIAS_1.column("value") + operator + " ?";
          dataList.add(SQL3DataType.VARCHAR);
          if (operator == Operator.CONTAINS)
             dataList.add("%" + attributeValue + "%");