You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/08/14 00:48:33 UTC
svn commit: r1372657 -
/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Author: kwright
Date: Mon Aug 13 22:48:33 2012
New Revision: 1372657
URL: http://svn.apache.org/viewvc?rev=1372657&view=rev
Log:
More change to address CONNECTORS-505.
Modified:
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/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=1372657&r1=1372656&r2=1372657&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 Mon Aug 13 22:48:33 2012
@@ -3440,7 +3440,7 @@ public class SharePointRepository extend
Map metaFieldList = null;
try
{
- if (metaPathState.equals("library"))
+ if (metaPathState.equals("library") || metaPathState.equals("file"))
metaFieldList = getLibFieldList(site,libOrList);
else if (metaPathState.equals("list"))
metaFieldList = getListFieldList(site,libOrList);
@@ -4232,28 +4232,44 @@ public class SharePointRepository extend
path = path + addon;
else
path = path + "/" + addon;
- currentContext.save("metapathstate","unknown");
+ if (library != null)
+ currentContext.save("metapathstate","file");
+ else
+ currentContext.save("metapathstate","unknown");
}
currentContext.save("metapath",path);
currentContext.save("metapathlibrary",library);
}
else if (pathop.equals("Remove"))
{
- // Strip off end
- String path = variableContext.getParameter("metapath");
- int index = path.lastIndexOf("/");
- path = path.substring(0,index);
- if (path.length() == 0)
- path = "/";
- currentContext.save("metapath",path);
- // Now, adjust state.
String pathState = variableContext.getParameter("metapathstate");
- if (pathState.equals("library") || pathState.equals("list"))
+ String path;
+ if (pathState.equals("file"))
+ {
+ pathState = "library";
+ path = variableContext.getParameter("metapathlibrary");
+ }
+ else if (pathState.equals("list") || pathState.equals("library"))
{
pathState = "site";
+ path = variableContext.getParameter("metapathlibrary");
+ int index = path.lastIndexOf("/");
+ path = path.substring(0,index);
+ if (path.length() == 0)
+ path = "/";
+ currentContext.save("metapathlibrary",null);
}
- currentContext.save("metapathlibrary",null);
+ else
+ {
+ path = variableContext.getParameter("metapath");
+ int index = path.lastIndexOf("/");
+ path = path.substring(0,index);
+ if (path.length() == 0)
+ path = "/";
+ }
+
currentContext.save("metapathstate",pathState);
+ currentContext.save("metapath",path);
}
}