Bug 317253 - [Webapp] Topics whose href includes an anchor do not show in the index when filtering is on

1 files changed, 19 insertions, 7 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
index 4d64163c7..d3d5670fe 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
@@ -143,13 +143,7 @@ public class WorkingSetScope extends AbstractHelpScope {
 					toc = (IToc) uae;
 					uae = null;
 				} else if (uae instanceof IIndexEntry) {
-					for (int i = 0; i < elements.length; i++) {
-						AdaptableHelpResource adaptable = elements[i];
-						if (adaptable.getTopic(topic.getHref()) != null) {
-							return true;
-						}
-					}
-					return false;
+					return isHrefInScope(topic.getHref());
 				} else {					
 					if (uae instanceof ITopic) {
 					    topics.add(uae);
@@ -179,6 +173,24 @@ public class WorkingSetScope extends AbstractHelpScope {
 		}
 		return false;
 	}
+
+	private boolean isHrefInScope(String href) {
+		String anchorlessHref;
+		int index = href.indexOf('#');
+		if (index != -1) {
+			anchorlessHref = href.substring(0, index);
+		} else {
+			anchorlessHref = href;
+		}
+
+		for (int i = 0; i < elements.length; i++) {
+			AdaptableHelpResource adaptable = elements[i];
+			if (adaptable.getTopic(anchorlessHref) != null) {
+				return true;
+			}
+		}
+		return false;
+	}
 	
 	private boolean inCriteriaScope(ITopic topic) {
 		if(null == topic){