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/09/06 23:20:46 UTC
svn commit: r1381761 - in
/manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch: ./
build.xml webservice/ webservice/MCPermissions.cs
Author: kwright
Date: Thu Sep 6 21:20:46 2012
New Revision: 1381761
URL: http://svn.apache.org/viewvc?rev=1381761&view=rev
Log:
Pull up fixes from trunk
Modified:
manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/ (props changed)
manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/build.xml
manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/ (props changed)
manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/MCPermissions.cs
Propchange: manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 6 21:20:46 2012
@@ -0,0 +1 @@
+/manifoldcf/integration/sharepoint-2010/trunk:1381360,1381649,1381693
Modified: manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/build.xml?rev=1381761&r1=1381760&r2=1381761&view=diff
==============================================================================
--- manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/build.xml (original)
+++ manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/build.xml Thu Sep 6 21:20:46 2012
@@ -60,6 +60,7 @@
<exclude name="/wsdls/Permissions.wsdl"/>
<exclude name="/webservice/Web References/SPPermissionsService/Permissions.wsdl"/>
<exclude name="/webservice/Package/*.wsp"/>
+ <exclude name="/webservice/bin/"/>
<exclude name="/dist/"/>
<exclude name="/apache-manifoldcf-sharepoint-2010-plugin-*"/>
</zipfileset>
@@ -72,6 +73,7 @@
<exclude name="/wsdls/Permissions.wsdl"/>
<exclude name="/webservice/Web References/SPPermissionsService/Permissions.wsdl"/>
<exclude name="/webservice/Package/*.wsp"/>
+ <exclude name="/webservice/bin/"/>
<exclude name="/dist/"/>
<exclude name="/apache-manifoldcf-sharepoint-2010-plugin-*"/>
</tarfileset>
Propchange: manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/
------------------------------------------------------------------------------
Merged /manifoldcf/integration/sharepoint-2010/trunk/webservice:r1381693
Modified: manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/MCPermissions.cs
URL: http://svn.apache.org/viewvc/manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/MCPermissions.cs?rev=1381761&r1=1381760&r2=1381761&view=diff
==============================================================================
--- manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/MCPermissions.cs (original)
+++ manifoldcf/integration/sharepoint-2010/branches/release-0.1-branch/webservice/MCPermissions.cs Thu Sep 6 21:20:46 2012
@@ -110,30 +110,25 @@ namespace MetaCarta.SharePoint.SoapServe
listQuery.ViewAttributes = "Scope=\"Recursive\"";
listQuery.ViewFields = string.Concat(
"<FieldRef Name='FileRef' />");
-
-
listQuery.RowLimit = 1000;
+ XmlDocument doc = new XmlDocument();
+ retVal = doc.CreateElement("GetListItems",
+ "http://schemas.microsoft.com/sharepoint/soap/directory/");
+ XmlNode getListItemsNode = doc.CreateElement("GetListItemsResponse");
+
uint counter = 0;
do
{
if (counter >= startRowParam + rowLimitParam)
break;
- // Will this work? Or will it reset something unexpected?
- if (startRowParam + rowLimitParam - counter < 1000)
- listQuery.RowLimit = startRowParam + rowLimitParam - counter;
-
SPListItemCollection collListItems = oList.GetItems(listQuery);
- XmlDocument doc = new XmlDocument();
- retVal = doc.CreateElement("GetListItems",
- "http://schemas.microsoft.com/sharepoint/soap/directory/");
- XmlNode getListItemsNode = doc.CreateElement("GetListItemsResponse");
foreach (SPListItem oListItem in collListItems)
{
- if (counter >= startRowParam)
+ if (counter >= startRowParam && counter < startRowParam + rowLimitParam)
{
XmlNode resultNode = doc.CreateElement("GetListItemsResult");
XmlAttribute idAttribute = doc.CreateAttribute("FileRef");
@@ -144,8 +139,9 @@ namespace MetaCarta.SharePoint.SoapServe
counter++;
}
- retVal.AppendChild(getListItemsNode);
} while (listQuery.ListItemCollectionPosition != null);
+
+ retVal.AppendChild(getListItemsNode);
}
}