Modify according to review by Joe Becknell.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/sharepoint-2010/trunk@1368512 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webservice/MCPermissions.cs b/webservice/MCPermissions.cs
index b774523..d294b6b 100644
--- a/webservice/MCPermissions.cs
+++ b/webservice/MCPermissions.cs
@@ -95,7 +95,8 @@
uint startRowParam = Convert.ToUInt32(startRow);
uint rowLimitParam = Convert.ToUInt32(rowLimit);
- using (SPWeb oWebsiteRoot = SPContext.Current.Site.RootWeb)
+ SPWeb oWebsiteRoot = SPContext.Current.Site.RootWeb;
+ if (oWebsiteRoot != null)
{
oWebsiteRoot.Lists.IncludeRootFolder = true;
@@ -103,30 +104,40 @@
SPQuery listQuery = new SPQuery();
listQuery.QueryThrottleMode = SPQueryThrottleOption.Override;
- listQuery.RowLimit = startRowParam + rowLimitParam;
-
- 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");
+ listQuery.RowLimit = 1000;
uint counter = 0;
- foreach (SPListItem oListItem in collListItems)
+ do
{
- if (counter >= startRowParam)
+ 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)
{
- XmlNode resultNode = doc.CreateElement("GetListItemsResult");
- XmlAttribute idAttribute = doc.CreateAttribute("FileRef");
- idAttribute.Value = oListItem.Url;
- resultNode.Attributes.Append(idAttribute);
- getListItemsNode.AppendChild(resultNode);
+ if (counter >= startRowParam)
+ {
+ XmlNode resultNode = doc.CreateElement("GetListItemsResult");
+ XmlAttribute idAttribute = doc.CreateAttribute("FileRef");
+ idAttribute.Value = oListItem.Url;
+ resultNode.Attributes.Append(idAttribute);
+ getListItemsNode.AppendChild(resultNode);
+ }
+ counter++;
}
- counter++;
- }
-
- retVal.AppendChild(getListItemsNode);
+
+ retVal.AppendChild(getListItemsNode);
+ } while (listQuery.ListItemCollectionPosition != null);
}
}
catch (SoapException soapEx)