wlu: fix patch from Kevin Gu: Search elements fail with 404 when target folder name is present in parent name for WAR deployment
diff --git a/1.5/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java b/1.5/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java
index b538765..5f789a0 100644
--- a/1.5/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java
+++ b/1.5/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java
@@ -78,7 +78,8 @@
private StringBuffer indexFolder = null;
private String productName = null;
private List filesToSkip = new ArrayList();
-
+ private File parentFolder = null;
+
public IndexBuilder(String publishDir) {
int appletIndex = -1;
if (publishDir == null)
@@ -89,6 +90,7 @@
pDirectory = UNCUtil.convertFilename((appletIndex > -1) ? publishDir
.substring(0, appletIndex + 1) : publishDir);
String siteName = pDirectory.replace(File.separatorChar, '/');
+ parentFolder = new File(pDirectory);
int index = siteName.length();
if (siteName.endsWith("/")) { //$NON-NLS-1$
index = index - 1;
@@ -354,8 +356,10 @@
}
luceneDocument = new Document();
-
- String url = file.getPath().replace(File.pathSeparatorChar, '/');
+
+ String url = productName
+ + file.getPath().substring(parentFolder.getPath().length())
+ .replace(File.separatorChar, '/'); //$NON-NLS-1$
luceneDocument.add(Field.UnIndexed(URL_FIELD, url));
// luceneDocument.add(Field.Text(CONTENT_FIELD, reader));
