Author: kwright
Date: Tue Sep 24 21:11:51 2013
New Revision: 1526011
URL: http://svn.apache.org/r1526011
Log:
Fix path handling, and path encoding for attachments
Modified:
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Modified:
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1526011&r1=1526010&r2=1526011&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
(original)
+++
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
Tue Sep 24 21:11:51 2013
@@ -1922,7 +1922,7 @@ public class SPSProxyHelper {
ListsWS lservice = new ListsWS(baseUrl + site, userName, password,
configuration, httpClient );
ListsSoapStub stub1 = (ListsSoapStub)lservice.getListsSoapHandler();
- String sitePlusDocId = serverLocation + site + "/" + docId;
+ String sitePlusDocId = serverLocation + site + docId;
if (sitePlusDocId.startsWith("/"))
sitePlusDocId = sitePlusDocId.substring(1);
Modified:
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1526011&r1=1526010&r2=1526011&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Tue Sep 24 21:11:51 2013
@@ -1001,7 +1001,7 @@ public class SharePointRepository extend
metadataDescription.add("Created");
// The document path includes the library, with no leading
slash, and is decoded.
int cutoff = decodedLibPath.lastIndexOf("/");
- String decodedDocumentPathWithoutSite =
decodedDocumentPath.substring(cutoff+1);
+ String decodedDocumentPathWithoutSite =
decodedDocumentPath.substring(cutoff);
Map<String,String> values = proxy.getFieldValues(
metadataDescription, encodedSitePath, libID, decodedDocumentPathWithoutSite,
dspStsWorks );
String modifiedDate = values.get("Modified");
@@ -1507,9 +1507,9 @@ public class SharePointRepository extend
createdDate = null;
// Fetch and index. This also filters documents based on
output connector restrictions.
- String fileUrl = serverUrl + urlBuffer.toString();
-
- if (!fetchAndIndexFile(activities, documentIdentifier,
version, fileUrl, fileUrl,
+ String fileUrl = serverUrl + encodePath(urlBuffer.toString());
+ String fetchUrl = fileUrl;
+ if (!fetchAndIndexFile(activities, documentIdentifier,
version, fileUrl, fetchUrl,
accessTokens, denyTokens, createdDate, modifiedDate, null,
sDesc))
{
// Document not indexed for whatever reason
