Author: kwright
Date: Wed Sep 18 07:17:23 2013
New Revision: 1524310
URL: http://svn.apache.org/r1524310
Log:
Remove fullListPaths everywhere; no longer used, since we now understand how
the path stuff actually works.
Modified:
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Modified:
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1524310&r1=1524309&r2=1524310&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
(original)
+++
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
Wed Sep 18 07:17:23 2013
@@ -759,7 +759,7 @@ public class SPSProxyHelper {
* @throws ManifoldCFException
* @throws ServiceInterruption
*/
- public String getDocLibID(String parentSite, String parentSiteDecoded,
String docLibrary, boolean fullListPaths)
+ public String getDocLibID(String parentSite, String parentSiteDecoded,
String docLibrary)
throws ServiceInterruption, ManifoldCFException
{
long currentTime;
@@ -952,7 +952,7 @@ public class SPSProxyHelper {
* @throws ManifoldCFException
* @throws ServiceInterruption
*/
- public String getListID(String parentSite, String parentSiteDecoded, String
listName, boolean fullListPaths)
+ public String getListID(String parentSite, String parentSiteDecoded, String
listName)
throws ServiceInterruption, ManifoldCFException
{
long currentTime;
@@ -2120,7 +2120,7 @@ public class SPSProxyHelper {
* @param parentSite the site to search for document libraries, empty string
for root
* @return lists of NameValue objects, representing document libraries
*/
- public ArrayList getDocumentLibraries( String parentSite, String
parentSiteDecoded, boolean fullListPaths )
+ public ArrayList getDocumentLibraries( String parentSite, String
parentSiteDecoded )
throws ManifoldCFException, ServiceInterruption
{
long currentTime;
@@ -2268,7 +2268,7 @@ public class SPSProxyHelper {
* @param parentSite the site to search for lists, empty string for root
* @return lists of NameValue objects, representing lists
*/
- public ArrayList getLists( String parentSite, String parentSiteDecoded,
boolean fullListPaths )
+ public ArrayList getLists( String parentSite, String parentSiteDecoded )
throws ManifoldCFException, ServiceInterruption
{
long currentTime;
Modified:
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1524310&r1=1524309&r2=1524310&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++
manifoldcf/branches/CONNECTORS-772/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Wed Sep 18 07:17:23 2013
@@ -85,7 +85,6 @@ public class SharePointRepository extend
private boolean supportsItemSecurity = false;
private boolean dspStsWorks = true;
- private boolean fullListPaths = true;
private boolean websBroken = false;
private String serverProtocol = null;
@@ -148,7 +147,6 @@ public class SharePointRepository extend
serverVersion = "2.0";
supportsItemSecurity = !serverVersion.equals("2.0");
dspStsWorks = !(serverVersion.equals("4.0") ||
serverVersion.equals("4.0AWS"));
- fullListPaths = !serverVersion.equals("4.0AWS");
websBroken = serverVersion.equals("4.0AWS");
serverProtocol = params.getParameter( "serverProtocol" );
@@ -761,7 +759,7 @@ public class SharePointRepository extend
String listID = listIDMap.get(decodedListPath);
if (listID == null)
{
- listID = proxy.getListID(encodedSitePath, sitePath, list,
fullListPaths);
+ listID = proxy.getListID(encodedSitePath, sitePath, list);
if (listID != null)
listIDMap.put(decodedListPath,listID);
}
@@ -916,7 +914,7 @@ public class SharePointRepository extend
String libID = libIDMap.get(decodedLibPath);
if (libID == null)
{
- libID = proxy.getDocLibID(encodedSitePath, sitePath, lib,
fullListPaths);
+ libID = proxy.getDocLibID(encodedSitePath, sitePath, lib);
if (libID != null)
libIDMap.put(decodedLibPath,libID);
}
@@ -1233,7 +1231,7 @@ public class SharePointRepository extend
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug( "SharePoint: Document identifier is a
list: '" + siteListPath + "'" );
- String listID = proxy.getListID( encodePath(site), site, listName,
fullListPaths );
+ String listID = proxy.getListID( encodePath(site), site, listName
);
if (listID != null)
{
ListItemStream fs = new ListItemStream( activities,
encodedServerLocation, siteListPath, spec );
@@ -1328,7 +1326,7 @@ public class SharePointRepository extend
String listID = listIDMap.get(decodedListPath);
if (listID == null)
{
- listID = proxy.getListID( encodePath(site), site,
listName, fullListPaths );
+ listID = proxy.getListID( encodePath(site), site,
listName );
if (listID == null)
listID = "";
listIDMap.put(decodedListPath,listID);
@@ -1403,7 +1401,7 @@ public class SharePointRepository extend
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug( "SharePoint: Document identifier is a
library: '" + siteLibPath + "'" );
- String libID = proxy.getDocLibID( encodePath(site), site, libName,
fullListPaths );
+ String libID = proxy.getDocLibID( encodePath(site), site, libName
);
if (libID != null)
{
FileStream fs = new FileStream( activities,
encodedServerLocation, siteLibPath, spec );
@@ -1617,7 +1615,7 @@ public class SharePointRepository extend
String documentLibID = docLibIDMap.get(decodedLibPath);
if (documentLibID == null)
{
- documentLibID = proxy.getDocLibID( encodePath(site),
site, libName, fullListPaths );
+ documentLibID = proxy.getDocLibID( encodePath(site),
site, libName );
if (documentLibID == null)
documentLibID = "";
docLibIDMap.put(decodedLibPath,documentLibID);
@@ -1743,7 +1741,7 @@ public class SharePointRepository extend
}
// Look at libraries
- ArrayList libraries = proxy.getDocumentLibraries(
encodePath(decodedSitePath), decodedSitePath, fullListPaths );
+ ArrayList libraries = proxy.getDocumentLibraries(
encodePath(decodedSitePath), decodedSitePath );
if (libraries != null)
{
int j = 0;
@@ -1764,7 +1762,7 @@ public class SharePointRepository extend
}
// Look at lists
- ArrayList lists = proxy.getLists( encodePath(decodedSitePath),
decodedSitePath, fullListPaths );
+ ArrayList lists = proxy.getLists( encodePath(decodedSitePath),
decodedSitePath );
if (lists != null)
{
int j = 0;
@@ -5037,7 +5035,7 @@ public class SharePointRepository extend
throws ServiceInterruption, ManifoldCFException
{
getSession();
- return proxy.getFieldList( encodePath(parentSite), proxy.getDocLibID(
encodePath(parentSite), parentSite, docLibrary, fullListPaths ) );
+ return proxy.getFieldList( encodePath(parentSite), proxy.getDocLibID(
encodePath(parentSite), parentSite, docLibrary ) );
}
/**
@@ -5050,7 +5048,7 @@ public class SharePointRepository extend
throws ServiceInterruption, ManifoldCFException
{
getSession();
- return proxy.getFieldList( encodePath(parentSite), proxy.getListID(
encodePath(parentSite), parentSite, listName, fullListPaths ) );
+ return proxy.getFieldList( encodePath(parentSite), proxy.getListID(
encodePath(parentSite), parentSite, listName ) );
}
/**
@@ -5074,7 +5072,7 @@ public class SharePointRepository extend
throws ManifoldCFException, ServiceInterruption
{
getSession();
- return proxy.getDocumentLibraries( encodePath(parentSite), parentSite,
fullListPaths );
+ return proxy.getDocumentLibraries( encodePath(parentSite), parentSite );
}
/**
@@ -5086,7 +5084,7 @@ public class SharePointRepository extend
throws ManifoldCFException, ServiceInterruption
{
getSession();
- return proxy.getLists( encodePath(parentSite), parentSite, fullListPaths );
+ return proxy.getLists( encodePath(parentSite), parentSite );
}
// Protected static methods
