| commit | 146845ad5a8d2a1af80b79b016e4a7cdfe6253ae | [log] [tgz] |
|---|---|---|
| author | Karl Wright <kwright@apache.org> | Tue Jul 12 06:13:39 2016 +0000 |
| committer | Karl Wright <kwright@apache.org> | Tue Jul 12 06:13:39 2016 +0000 |
| tree | 0f08619254ac083cbcff73bcb104a75532fb46f8 | |
| parent | 28606bf7adbe884190b969e9a337263d2e304957 [diff] |
Fix for CONNECTORS-1326. Committed on behalf of Chalitha Perera. git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1752243 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt index f97ecef..54c056e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt
@@ -3,6 +3,9 @@ ======================= 2.5-dev ===================== +CONNECTORS-1326: Fix URL for Confluence documents. +(Chalitha Perera) + CONNECTORS-1325: Deal with SharePoint bad XML when document has optional plane utf-16 characters. Documents with these are skipped since Java can't represent them either.
diff --git a/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java b/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java index 3eb50b6..25387ed 100644 --- a/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java +++ b/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java
@@ -291,7 +291,7 @@ String webUrl = (String) links.optString(KEY_WEBUI, ""); page.urlContext = (String) links.optString(KEY_CONTEXT, ""); page.baseUrl = (String) links.optString(KEY_BASE, ""); - page.webUrl = page.baseUrl + page.urlContext + webUrl; + page.webUrl = page.baseUrl + webUrl; }