svn commit: r1526076 - in /manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch: ./ CHANGES.txt webservice/ webservice/MCPermissions.cs

[kwright]

Author: kwright
Date: Wed Sep 25 01:00:19 2013
New Revision: 1526076

URL: http://svn.apache.org/r1526076
Log:
Pull up changes for CONNECTORS-782.

Modified:
    manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/   
(props changed)
    
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/CHANGES.txt
    
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/  
 (props changed)
    
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/MCPermissions.cs

Propchange: manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/integration/sharepoint-2010/trunk:r1526075

Modified: 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/CHANGES.txt?rev=1526076&r1=1526075&r2=1526076&view=diff
==============================================================================
--- 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/CHANGES.txt 
(original)
+++ 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/CHANGES.txt 
Wed Sep 25 01:00:19 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= Release 0.3 =====================
 
+CONNECTORS-782: Add support for GUID return value for lists
+service.
+(Dmitry Goldenberg, Karl Wright)
+
 CONNECTORS-772: SharePoint on AWS does not permit using the
 URL to locate the site.
 (Dmitry Goldenberg, Karl Wright)

Propchange: 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/
------------------------------------------------------------------------------
  Merged /manifoldcf/integration/sharepoint-2010/trunk/webservice:r1526075

Modified: 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/MCPermissions.cs
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/MCPermissions.cs?rev=1526076&r1=1526075&r2=1526076&view=diff
==============================================================================
--- 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/MCPermissions.cs
 (original)
+++ 
manifoldcf/integration/sharepoint-2010/branches/release-0.3-branch/webservice/MCPermissions.cs
 Wed Sep 25 01:00:19 2013
@@ -105,7 +105,7 @@ namespace MetaCarta.SharePoint.SoapServe
                         listQuery.Query = "<OrderBy 
Override=\"TRUE\"><FieldRef Name=\"FileRef\" /></OrderBy>";
                         listQuery.QueryThrottleMode = 
SPQueryThrottleOption.Override;
                         listQuery.ViewAttributes = "Scope=\"Recursive\"";
-                        listQuery.ViewFields = "<FieldRef Name='FileRef' />";
+                        listQuery.ViewFields = "<FieldRef 
Name='FileRef'/><FieldRef Name='ID'/><FieldRef Name='UniqueId'/>";
                         listQuery.RowLimit = 1000;
 
                         XmlDocument doc = new XmlDocument();
@@ -127,9 +127,15 @@ namespace MetaCarta.SharePoint.SoapServe
                                 if (counter >= startRowParam && counter < 
startRowParam + rowLimitParam)
                                 {
                                     XmlNode resultNode = 
doc.CreateElement("GetListItemsResult");
-                                    XmlAttribute idAttribute = 
doc.CreateAttribute("FileRef");
-                                    idAttribute.Value = oListItem.Url;
+                                    XmlAttribute urlAttribute = 
doc.CreateAttribute("FileRef");
+                                    urlAttribute.Value = oListItem.Url;
+                                    resultNode.Attributes.Append(urlAttribute);
+                                    XmlAttribute idAttribute = 
doc.CreateAttribute("ID");
+                                    idAttribute.Value = 
oListItem.ID.ToString();
                                     resultNode.Attributes.Append(idAttribute);
+                                    XmlAttribute uniqueIdAttribute = 
doc.CreateAttribute("GUID");
+                                    uniqueIdAttribute.Value = 
oListItem.UniqueId.ToString();
+                                    
resultNode.Attributes.Append(uniqueIdAttribute);
                                     getListItemsNode.AppendChild(resultNode);
                                 }
                                 counter++;