Bug 221599 – Dynamically generated topic files don't get same <script> as regular onesv20080310

2 files changed, 14 insertions, 2 deletions

diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
index c68ad2a37..44c47726f 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
@@ -59,6 +59,10 @@ public class LayoutData extends RequestData {
 	}
 
 	public String getContentURL() {
+		String navHref = request.getParameter("nav"); //$NON-NLS-1$
+		if (navHref != null) {
+			return "../nav" + navHref; //$NON-NLS-1$
+		}
 		String topicHref = request.getParameter("topic"); //$NON-NLS-1$
 		if (topicHref == null || topicHref.length() == 0) {
 			return UrlUtil.getHelpURL(preferences.getHelpHome());
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
index 0846403a4..9df244448 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
@@ -30,7 +30,11 @@ public class FramesetFilter implements IFilter {
 	 */
 	public OutputStream filter(HttpServletRequest req, OutputStream out) {
 		String uri = req.getRequestURI();
-		if (uri == null || !uri.endsWith("html") && !uri.endsWith("htm")) { //$NON-NLS-1$ //$NON-NLS-2$
+		if (uri == null) {
+			return out;
+		}
+		boolean isNavPath = UrlUtil.isNavPath(uri);
+		if (!uri.endsWith("html") && !uri.endsWith("htm") && !isNavPath) { //$NON-NLS-1$ //$NON-NLS-2$
 			return out;
 		}
 
@@ -54,7 +58,11 @@ public class FramesetFilter implements IFilter {
 		for (int i; 0 <= (i = path.indexOf('/')); path = path.substring(i + 1)) {
 			script.append("../"); //$NON-NLS-1$
 		}
-		script.append("index.jsp?topic="); //$NON-NLS-1$
+		if (isNavPath) {
+			script.append("index.jsp?nav="); //$NON-NLS-1$
+		} else {
+			script.append("index.jsp?topic="); //$NON-NLS-1$
+		}
 		script.append(req.getPathInfo());
 		script.append(scriptPart3);
 		try {