Return-Path: 
 <commits-return-4834-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F418F107CD
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Thu, 19 Sep 2013 09:06:55 +0000 (UTC)
Received: (qmail 28485 invoked by uid 500); 19 Sep 2013 09:06:55 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 28438 invoked by uid 500); 19 Sep 2013 09:06:50 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 28430 invoked by uid 99); 19 Sep 2013 09:06:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Sep 2013 09:06:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Sep 2013 09:06:40 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 89C182388831;
	Thu, 19 Sep 2013 09:06:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1524661 - in
 /manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint:
 SPSProxyHelper.java SharePointRepository.java
Date: Thu, 19 Sep 2013 09:06:17 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130919090617.89C182388831@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Thu Sep 19 09:06:16 2013
New Revision: 1524661

URL: http://svn.apache.org/r1524661
Log:
Hook up attachment name fetch

Modified:
    manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
    manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java

Modified: manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1524661&r1=1524660&r2=1524661&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java (original)
+++ manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java Thu Sep 19 09:06:16 2013
@@ -1533,63 +1533,67 @@ public class SPSProxyHelper {
 
   /** Gets a list of attachment URLs, given a site, list name, and list item ID.  The returned URLs will be relative to the site.
   */
-  public List<String> getAttachmentURLs( String site, String listName, String itemID, boolean supportsAttachments )
+  public List<String> getAttachmentNames( String site, String listName, String itemID )
     throws ManifoldCFException, ServiceInterruption
   {
     long currentTime;
     try
     {
       ArrayList<String> result = new ArrayList<String>();
-      if (supportsAttachments)
-      {
-        if (Logging.connectors.isDebugEnabled())
-          Logging.connectors.debug("SharePoint: In getAttachmentURLs; site='"+site+"', listName='"+listName+"', itemID='"+itemID+"'");
+      
+      if (Logging.connectors.isDebugEnabled())
+        Logging.connectors.debug("SharePoint: In getAttachmentURLs; site='"+site+"', listName='"+listName+"', itemID='"+itemID+"'");
 
-        // The docLibrary must be a GUID, because we don't have  title.
+      // The docLibrary must be a GUID, because we don't have  title.
 
-        if ( site.compareTo( "/") == 0 )
-          site = "";
-        ListsWS listService = new ListsWS( baseUrl + site, userName, password, configuration, httpClient );
-        ListsSoap listCall = listService.getListsSoapHandler();
+      if ( site.compareTo( "/") == 0 )
+        site = "";
+      ListsWS listService = new ListsWS( baseUrl + site, userName, password, configuration, httpClient );
+      ListsSoap listCall = listService.getListsSoapHandler();
 
-        GetAttachmentCollectionResponseGetAttachmentCollectionResult listResponse =
-          listCall.getAttachmentCollection( listName, itemID );
-        org.apache.axis.message.MessageElement[] List = listResponse.get_any();
+      GetAttachmentCollectionResponseGetAttachmentCollectionResult listResponse =
+        listCall.getAttachmentCollection( listName, itemID );
+      org.apache.axis.message.MessageElement[] List = listResponse.get_any();
 
-        System.out.println(List[0].toString());
+      System.out.println(List[0].toString());
         
-        XMLDoc doc = new XMLDoc( List[0].toString() );
-        ArrayList nodeList = new ArrayList();
+      XMLDoc doc = new XMLDoc( List[0].toString() );
+      ArrayList nodeList = new ArrayList();
 
-        doc.processPath(nodeList, "*", null);
-        if (nodeList.size() != 1)
-        {
-          throw new ManifoldCFException("Bad xml - missing outer node - there are "+Integer.toString(nodeList.size())+" nodes");
-        }
+      doc.processPath(nodeList, "*", null);
+      if (nodeList.size() != 1)
+      {
+        throw new ManifoldCFException("Bad xml - missing outer node - there are "+Integer.toString(nodeList.size())+" nodes");
+      }
 
-        Object parent = nodeList.get(0);
-        if (!doc.getNodeName(parent).equals("ns1:List"))
-          throw new ManifoldCFException("Bad xml - outer node is '" + doc.getNodeName(parent) + "' not 'ns1:List'");
+      Object parent = nodeList.get(0);
+      if (!doc.getNodeName(parent).equals("ns1:List"))
+        throw new ManifoldCFException("Bad xml - outer node is '" + doc.getNodeName(parent) + "' not 'ns1:List'");
 
-        nodeList.clear();
-        doc.processPath(nodeList, "*", parent);  // <ns1:Attachments>
+      nodeList.clear();
+      doc.processPath(nodeList, "*", parent);  // <ns1:Attachments>
 
-        Object attachments = nodeList.get(0);
-        if ( !doc.getNodeName(attachments).equals("ns1:Attachments") )
-          throw new ManifoldCFException( "Bad xml - child node 0 '" + doc.getNodeName(attachments) + "' is not 'ns1:Attachments'");
+      Object attachments = nodeList.get(0);
+      if ( !doc.getNodeName(attachments).equals("ns1:Attachments") )
+        throw new ManifoldCFException( "Bad xml - child node 0 '" + doc.getNodeName(attachments) + "' is not 'ns1:Attachments'");
 
-        nodeList.clear();
-        doc.processPath(nodeList, "*", attachments);
+      nodeList.clear();
+      doc.processPath(nodeList, "*", attachments);
 
-        int i = 0;
-        while (i < nodeList.size())
+      int i = 0;
+      while (i < nodeList.size())
+      {
+        Object o = nodeList.get( i++ );
+        String attachmentURL = doc.getValue( o, "ns1:Attachment" );
+        if (attachmentURL != null)
         {
-          Object o = nodeList.get( i++ );
-          String attachmentURL = doc.getValue( o, "ns1:Attachment" );
-          if (attachmentURL != null)
-            result.add(attachmentURL);
+          int index = attachmentURL.lastIndexOf("/");
+          if (index == -1)
+            throw new ManifoldCFException("Unexpected attachment URL form: '"+attachmentURL+"'");
+          result.add(attachmentURL.substring(index+1));
         }
       }
+
       return result;
     }
     catch (java.net.MalformedURLException e)

Modified: manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1524661&r1=1524660&r2=1524661&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/branches/CONNECTORS-778/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Thu Sep 19 09:06:16 2013
@@ -70,6 +70,8 @@ import org.apache.http.protocol.HttpCont
 *   /sitepath/libraryname//folderfilepath - the relative path to a file.  The path MUST begin with a single "/" and MUST include a "//" after the library, and must NOT end with a "/".
 *   /sitepath/listname/// - the relative path to a list.  The path MUST begin with a single "/" and end with "///".
 *   /sitepath/listname///rowid - the relative path to a list item.  The path MUST begin with a single "/" and MUST include a "///" after the list name, and must NOT end in a "/".
+*   /sitepath/listname///rowid/attachment_filename - the relative path to a list attachment.  The path MUST begin with a single "/", MUST include a "///" after the list name, and
+*      MUST include a "/" separating the rowid from the filename.
 */
 public class SharePointRepository extends org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector
 {
@@ -85,6 +87,7 @@ public class SharePointRepository extend
   
   private boolean supportsItemSecurity = false;
   private boolean dspStsWorks = true;
+  private boolean attachmentsSupported = false;
   
   private String serverProtocol = null;
   private String serverUrl = null;
@@ -146,6 +149,7 @@ public class SharePointRepository extend
         serverVersion = "2.0";
       supportsItemSecurity = !serverVersion.equals("2.0");
       dspStsWorks = !serverVersion.equals("4.0");
+      attachmentsSupported = !serverVersion.equals("2.0");
 
       serverProtocol = params.getParameter( "serverProtocol" );
       if (serverProtocol == null)
@@ -743,7 +747,7 @@ public class SharePointRepository extend
           // === List-style identifier ===
           if (dListSeparatorIndex == documentIdentifier.length() - 3)
           {
-            // List path!
+            // == List path! ==
             if (checkIncludeList(documentIdentifier.substring(0,documentIdentifier.length()-3),spec))
               // This is the path for the list: No versioning
               rval[i] = "";
@@ -756,140 +760,153 @@ public class SharePointRepository extend
           }
           else
           {
-            // List item path!
+            // == List item or attachment path! ==
             // Convert the modified document path to an unmodified one, plus a library path.
             String decodedListPath = documentIdentifier.substring(0,dListSeparatorIndex);
-            String decodedItemPath = decodedListPath + documentIdentifier.substring(dListSeparatorIndex+2);
-            if (checkIncludeListItem(decodedItemPath,spec))
-            {
-              // This file is included, so calculate a version string.  This will include metadata info, so get that first.
-              MetadataInformation metadataInfo = getMetadataSpecification(decodedItemPath,spec);
+            String itemAndAttachment = documentIdentifier.substring(dListSeparatorIndex+2);
+            String decodedItemPath = decodedListPath + itemAndAttachment;
 
-              int lastIndex = decodedListPath.lastIndexOf("/");
-              String sitePath = decodedListPath.substring(0,lastIndex);
-              String list = decodedListPath.substring(lastIndex+1);
+            int attachmentSeparatorIndex = itemAndAttachment.indexOf("/");
+            if (attachmentSeparatorIndex == -1)
+            {
+              // == List item path! ==
+              if (checkIncludeListItem(decodedItemPath,spec))
+              {
+                // This file is included, so calculate a version string.  This will include metadata info, so get that first.
+                MetadataInformation metadataInfo = getMetadataSpecification(decodedItemPath,spec);
 
-              String encodedSitePath = encodePath(sitePath);
+                int lastIndex = decodedListPath.lastIndexOf("/");
+                String sitePath = decodedListPath.substring(0,lastIndex);
+                String list = decodedListPath.substring(lastIndex+1);
+
+                String encodedSitePath = encodePath(sitePath);
+
+                // Need to get the library id.  Cache it if we need to calculate it.
+                String listID = listIDMap.get(decodedListPath);
+                if (listID == null)
+                {
+                  listID = proxy.getListID(encodedSitePath, sitePath, list);
+                  if (listID != null)
+                    listIDMap.put(decodedListPath,listID);
+                }
 
-              // Need to get the library id.  Cache it if we need to calculate it.
-              String listID = listIDMap.get(decodedListPath);
-              if (listID == null)
-              {
-                listID = proxy.getListID(encodedSitePath, sitePath, list);
                 if (listID != null)
-                  listIDMap.put(decodedListPath,listID);
-              }
-
-              if (listID != null)
-              {
-                String[] sortedMetadataFields = getInterestingFieldSetSorted(metadataInfo,encodedSitePath,listID,fieldListMap);
-                
-                if (sortedMetadataFields != null)
                 {
-                  // Next, get the actual timestamp field for the file.
-                  ArrayList metadataDescription = new ArrayList();
-                  metadataDescription.add("Modified");
-                  metadataDescription.add("Created");
-                  // The document path includes the library, with no leading slash, and is decoded.
-                  int cutoff = decodedListPath.lastIndexOf("/");
-                  String decodedItemPathWithoutSite = decodedItemPath.substring(cutoff+1);
-                  Map values = proxy.getFieldValues( metadataDescription, encodedSitePath, listID, "/Lists/" + decodedItemPathWithoutSite, dspStsWorks );
-                  String modifiedDate = (String)values.get("Modified");
-                  String createdDate = (String)values.get("Created");
-                  if (modifiedDate != null)
+                  String[] sortedMetadataFields = getInterestingFieldSetSorted(metadataInfo,encodedSitePath,listID,fieldListMap);
+                  
+                  if (sortedMetadataFields != null)
                   {
-                    // Item has a modified date so we presume it exists.
-                    
-                    Date modifiedDateValue = DateParser.parseISO8601Date(modifiedDate);
-                    Date createdDateValue = DateParser.parseISO8601Date(createdDate);
-                    
-                    // Build version string
-                    String versionToken = modifiedDate;
-                    
-                    // Revamped version string on 11/8/2006 to make parseability better
-
-                    StringBuilder sb = new StringBuilder();
+                    // Next, get the actual timestamp field for the file.
+                    ArrayList metadataDescription = new ArrayList();
+                    metadataDescription.add("Modified");
+                    metadataDescription.add("Created");
+                    // The document path includes the library, with no leading slash, and is decoded.
+                    int cutoff = decodedListPath.lastIndexOf("/");
+                    String decodedItemPathWithoutSite = decodedItemPath.substring(cutoff+1);
+                    Map values = proxy.getFieldValues( metadataDescription, encodedSitePath, listID, "/Lists/" + decodedItemPathWithoutSite, dspStsWorks );
+                    String modifiedDate = (String)values.get("Modified");
+                    String createdDate = (String)values.get("Created");
+                    if (modifiedDate != null)
+                    {
+                      // Item has a modified date so we presume it exists.
+                      
+                      Date modifiedDateValue = DateParser.parseISO8601Date(modifiedDate);
+                      Date createdDateValue = DateParser.parseISO8601Date(createdDate);
+                      
+                      // Build version string
+                      String versionToken = modifiedDate;
+                      
+                      // Revamped version string on 11/8/2006 to make parseability better
 
-                    packList(sb,sortedMetadataFields,'+');
+                      StringBuilder sb = new StringBuilder();
 
-                    // Do the acls.
-                    boolean foundAcls = true;
-                    if (acls != null)
-                    {
-                      sb.append('+');
+                      packList(sb,sortedMetadataFields,'+');
 
-                      // If there are forced acls, use those in the version string instead.
-                      String[] accessTokens;
-                      if (acls.length == 0)
+                      // Do the acls.
+                      boolean foundAcls = true;
+                      if (acls != null)
                       {
-                        // The goal here is simply to record what should get ingested with the document, so that
-                        // we can compare against future values.
-                        // Grab the acls for this combo, if we haven't already
-                        accessTokens = lookupAccessTokensSorted(encodedSitePath,listID,ACLmap);
+                        sb.append('+');
+
+                        // If there are forced acls, use those in the version string instead.
+                        String[] accessTokens;
+                        if (acls.length == 0)
+                        {
+                          // The goal here is simply to record what should get ingested with the document, so that
+                          // we can compare against future values.
+                          // Grab the acls for this combo, if we haven't already
+                          accessTokens = lookupAccessTokensSorted(encodedSitePath,listID,ACLmap);
+                            
+                          if (accessTokens == null)
+                            foundAcls = false;
                           
-                        if (accessTokens == null)
-                          foundAcls = false;
-                        
+                        }
+                        else
+                          accessTokens = acls;
+                        // Only pack access tokens if they are non-null; we'll be giving up anyhow otherwise
+                        if (foundAcls)
+                        {
+                          packList(sb,accessTokens,'+');
+                          // Added 4/21/2008 to handle case when AD authority is down
+                          pack(sb,defaultAuthorityDenyToken,'+');
+                        }
                       }
                       else
-                        accessTokens = acls;
-                      // Only pack access tokens if they are non-null; we'll be giving up anyhow otherwise
+                        sb.append('-');
                       if (foundAcls)
                       {
-                        packList(sb,accessTokens,'+');
-                        // Added 4/21/2008 to handle case when AD authority is down
-                        pack(sb,defaultAuthorityDenyToken,'+');
+                        packDate(sb,modifiedDateValue);
+                        packDate(sb,createdDateValue);
+                        // The rest of this is unparseable
+                        sb.append(versionToken);
+                        sb.append(pathNameAttributeVersion);
+                        // Added 9/7/07
+                        sb.append("_").append(fileBaseUrl);
+                        //
+                        rval[i] = sb.toString();
+                        if (Logging.connectors.isDebugEnabled())
+                          Logging.connectors.debug( "SharePoint: Complete version string for '"+documentIdentifier+"': " + rval[i]);
+                      }
+                      else
+                      {
+                        if (Logging.connectors.isDebugEnabled())
+                          Logging.connectors.debug("SharePoint: Couldn't get access tokens for list '"+decodedListPath+"'; removing list item '"+documentIdentifier+"'");
+                        rval[i] = null;
                       }
-                    }
-                    else
-                      sb.append('-');
-                    if (foundAcls)
-                    {
-                      packDate(sb,modifiedDateValue);
-                      packDate(sb,createdDateValue);
-                      // The rest of this is unparseable
-                      sb.append(versionToken);
-                      sb.append(pathNameAttributeVersion);
-                      // Added 9/7/07
-                      sb.append("_").append(fileBaseUrl);
-                      //
-                      rval[i] = sb.toString();
-                      if (Logging.connectors.isDebugEnabled())
-                        Logging.connectors.debug( "SharePoint: Complete version string for '"+documentIdentifier+"': " + rval[i]);
                     }
                     else
                     {
                       if (Logging.connectors.isDebugEnabled())
-                        Logging.connectors.debug("SharePoint: Couldn't get access tokens for list '"+decodedListPath+"'; removing list item '"+documentIdentifier+"'");
+                        Logging.connectors.debug("SharePoint: Can't get version of '"+documentIdentifier+"' because it has no modify date");
                       rval[i] = null;
                     }
                   }
                   else
                   {
                     if (Logging.connectors.isDebugEnabled())
-                      Logging.connectors.debug("SharePoint: Can't get version of '"+documentIdentifier+"' because it has no modify date");
+                      Logging.connectors.debug("SharePoint: Can't get version of '"+documentIdentifier+"' because list '"+decodedListPath+"' doesn't respond to metadata requests - removing");
                     rval[i] = null;
                   }
                 }
                 else
                 {
                   if (Logging.connectors.isDebugEnabled())
-                    Logging.connectors.debug("SharePoint: Can't get version of '"+documentIdentifier+"' because list '"+decodedListPath+"' doesn't respond to metadata requests - removing");
+                    Logging.connectors.debug("SharePoint: Can't get version of '"+documentIdentifier+"' because list '"+decodedListPath+"' does not exist - removing");
                   rval[i] = null;
                 }
               }
               else
               {
                 if (Logging.connectors.isDebugEnabled())
-                  Logging.connectors.debug("SharePoint: Can't get version of '"+documentIdentifier+"' because list '"+decodedListPath+"' does not exist - removing");
+                  Logging.connectors.debug("SharePoint: List item '"+documentIdentifier+"' is no longer included - removing");
                 rval[i] = null;
               }
             }
             else
             {
-              if (Logging.connectors.isDebugEnabled())
-                Logging.connectors.debug("SharePoint: List item '"+documentIdentifier+"' is no longer included - removing");
-              rval[i] = null;
+              // == List item attachment path! ==
+              // MHL
+              rval[i] = "";
             }
           }
         }
@@ -1269,140 +1286,178 @@ public class SharePointRepository extend
           }
           else
           {
-            // List item identifier
-            if ( !scanOnly[ i ] )
+            // == List item or attachment identifier ==
+            
+            // Get the item part of the path
+            String decodedListPath = documentIdentifier.substring(0,dListSeparatorIndex);
+            String itemAndAttachment = documentIdentifier.substring(dListSeparatorIndex+2);
+            String decodedItemPath = decodedListPath + itemAndAttachment;
+            
+            // If the item part has a slash, we're looking at an attachment
+            int attachmentSeparatorIndex = itemAndAttachment.indexOf("/");
+            if (attachmentSeparatorIndex == -1)
             {
-              // Convert the modified document path to an unmodified one, plus a library path.
-              String decodedListPath = documentIdentifier.substring(0,dListSeparatorIndex);
-              String decodedItemPath = decodedListPath + documentIdentifier.substring(dListSeparatorIndex+2);
+              // == List item identifier ==
               
-              // The item path may actually reference both an item number and a binary attachment.  Still trying to determine how to encode this.
-              // ???
+              // Before we index, we queue up any attachments
+              int cutoff = decodedListPath.lastIndexOf( "/" );
+              String site = decodedListPath.substring(0,cutoff);
+              String listName = decodedListPath.substring( cutoff + 1 );
               
-              int cutoff = decodedListPath.lastIndexOf("/");
-              String encodedItemPath = encodePath(decodedListPath.substring(0,cutoff) + "/Lists/" + decodedItemPath.substring(cutoff+1));
-
-              int listCutoff = decodedListPath.lastIndexOf( "/" );
-              String site = decodedListPath.substring(0,listCutoff);
-              String listName = decodedListPath.substring( listCutoff + 1 );
-
-              // Parse what we need out of version string.
-
-              // Placeholder for metadata specification
-              ArrayList metadataDescription = new ArrayList();
-              int startPosition = unpackList(metadataDescription,version,0,'+');
-
-              // Acls
-              ArrayList acls = null;
-              String denyAcl = null;
-              if (startPosition < version.length() && version.charAt(startPosition++) == '+')
+              if (attachmentsSupported)
               {
-                acls = new ArrayList();
-                startPosition = unpackList(acls,version,startPosition,'+');
-                if (startPosition < version.length())
+                String itemID = itemAndAttachment.substring(attachmentSeparatorIndex+1);
+                String listID = listIDMap.get(decodedListPath);
+                if (listID == null)
                 {
-                  StringBuilder denyAclBuffer = new StringBuilder();
-                  startPosition = unpack(denyAclBuffer,version,startPosition,'+');
-                  denyAcl = denyAclBuffer.toString();
+                  listID = proxy.getListID( encodePath(site), site, listName );
+                  if (listID == null)
+                    listID = "";
+                  listIDMap.put(decodedListPath,listID);
+                }
+  
+                if (listID.length() == 0)
+                {
+                  if (Logging.connectors.isDebugEnabled())
+                    Logging.connectors.debug("SharePoint: List '"+decodedListPath+"' no longer exists - deleting item '"+documentIdentifier+"'");
+                  activities.deleteDocument(documentIdentifier,version);
+                  i++;
+                  continue;
                 }
-              }
 
-              Date modifiedDate = new Date(0L);
-              startPosition = unpackDate(version,startPosition,modifiedDate);
-              if (modifiedDate.getTime() == 0L)
-                modifiedDate = null;
-              Date createdDate = new Date(0L);
-              startPosition = unpackDate(version,startPosition,createdDate);
-              if (createdDate.getTime() == 0L)
-                createdDate = null;
+                // Get the attachment names
+                List<String> attachmentNames = proxy.getAttachmentNames( site, listID, itemID );
+                // MHL
+              }
               
-              // Generate the URL we are going to use
-              String itemUrl = fileBaseUrl + encodedItemPath;
-              if (Logging.connectors.isDebugEnabled())
-                Logging.connectors.debug( "SharePoint: Processing item '"+documentIdentifier+"'; url: '" + itemUrl + "'" );
-
-              if (activities.checkLengthIndexable(0L))
+              if ( !scanOnly[ i ] )
               {
-                InputStream is = new ByteArrayInputStream(new byte[0]);
-                try
+                // Convert the modified document path to an unmodified one, plus a library path.
+                String encodedItemPath = encodePath(decodedListPath.substring(0,cutoff) + "/Lists/" + decodedItemPath.substring(cutoff+1));
+                
+                // Parse what we need out of version string.
+
+                // Placeholder for metadata specification
+                ArrayList metadataDescription = new ArrayList();
+                int startPosition = unpackList(metadataDescription,version,0,'+');
+
+                // Acls
+                ArrayList acls = null;
+                String denyAcl = null;
+                if (startPosition < version.length() && version.charAt(startPosition++) == '+')
                 {
-                  RepositoryDocument data = new RepositoryDocument();
-                  data.setBinary( is, 0L );
+                  acls = new ArrayList();
+                  startPosition = unpackList(acls,version,startPosition,'+');
+                  if (startPosition < version.length())
+                  {
+                    StringBuilder denyAclBuffer = new StringBuilder();
+                    startPosition = unpack(denyAclBuffer,version,startPosition,'+');
+                    denyAcl = denyAclBuffer.toString();
+                  }
+                }
 
-                  if (modifiedDate != null)
-                    data.setModifiedDate(modifiedDate);
-                  if (createdDate != null)
-                    data.setCreatedDate(createdDate);
-                  
-                  setDataACLs(data,acls,denyAcl);
-                  
-                  setPathAttribute(data,sDesc,documentIdentifier);
+                Date modifiedDate = new Date(0L);
+                startPosition = unpackDate(version,startPosition,modifiedDate);
+                if (modifiedDate.getTime() == 0L)
+                  modifiedDate = null;
+                Date createdDate = new Date(0L);
+                startPosition = unpackDate(version,startPosition,createdDate);
+                if (createdDate.getTime() == 0L)
+                  createdDate = null;
+                
+                // Generate the URL we are going to use
+                String itemUrl = fileBaseUrl + encodedItemPath;
+                if (Logging.connectors.isDebugEnabled())
+                  Logging.connectors.debug( "SharePoint: Processing item '"+documentIdentifier+"'; url: '" + itemUrl + "'" );
 
-                  // Retrieve field values from SharePoint
-                  if (metadataDescription.size() > 0)
+                if (activities.checkLengthIndexable(0L))
+                {
+                  InputStream is = new ByteArrayInputStream(new byte[0]);
+                  try
                   {
-                    String listID = listIDMap.get(decodedListPath);
-                    if (listID == null)
+                    RepositoryDocument data = new RepositoryDocument();
+                    data.setBinary( is, 0L );
+
+                    if (modifiedDate != null)
+                      data.setModifiedDate(modifiedDate);
+                    if (createdDate != null)
+                      data.setCreatedDate(createdDate);
+                    
+                    setDataACLs(data,acls,denyAcl);
+                    
+                    setPathAttribute(data,sDesc,documentIdentifier);
+
+                    // Retrieve field values from SharePoint
+                    if (metadataDescription.size() > 0)
                     {
-                      listID = proxy.getListID( encodePath(site), site, listName );
+                      String listID = listIDMap.get(decodedListPath);
                       if (listID == null)
-                        listID = "";
-                      listIDMap.put(decodedListPath,listID);
-                    }
+                      {
+                        listID = proxy.getListID( encodePath(site), site, listName );
+                        if (listID == null)
+                          listID = "";
+                        listIDMap.put(decodedListPath,listID);
+                      }
 
-                    if (listID.length() == 0)
-                    {
-                      if (Logging.connectors.isDebugEnabled())
-                        Logging.connectors.debug("SharePoint: List '"+decodedListPath+"' no longer exists - deleting item '"+documentIdentifier+"'");
-                      activities.deleteDocument(documentIdentifier,version);
-                      i++;
-                      continue;
-                    }
+                      if (listID.length() == 0)
+                      {
+                        if (Logging.connectors.isDebugEnabled())
+                          Logging.connectors.debug("SharePoint: List '"+decodedListPath+"' no longer exists - deleting item '"+documentIdentifier+"'");
+                        activities.deleteDocument(documentIdentifier,version);
+                        i++;
+                        continue;
+                      }
 
-                    Map values = proxy.getFieldValues( metadataDescription, encodePath(site), listID, "/Lists/" + decodedItemPath.substring(cutoff+1), dspStsWorks );
-                    if (values != null)
-                    {
-                      Iterator iter = values.keySet().iterator();
-                      while (iter.hasNext())
+                      Map values = proxy.getFieldValues( metadataDescription, encodePath(site), listID, "/Lists/" + decodedItemPath.substring(cutoff+1), dspStsWorks );
+                      if (values != null)
+                      {
+                        Iterator iter = values.keySet().iterator();
+                        while (iter.hasNext())
+                        {
+                          String fieldName = (String)iter.next();
+                          String fieldData = (String)values.get(fieldName);
+                          System.out.println("Item '"+decodedItemPath+"' has field '"+fieldName+"' value '"+fieldData+"'");
+                          data.addField(fieldName,fieldData);
+                        }
+                      }
+                      else
                       {
-                        String fieldName = (String)iter.next();
-                        String fieldData = (String)values.get(fieldName);
-                        System.out.println("Item '"+decodedItemPath+"' has field '"+fieldName+"' value '"+fieldData+"'");
-                        data.addField(fieldName,fieldData);
+                        // Item has vanished
+                        if (Logging.connectors.isDebugEnabled())
+                          Logging.connectors.debug("SharePoint: Item metadata fetch failure indicated that item is gone: '"+documentIdentifier+"' - removing");
+                        activities.deleteDocument(documentIdentifier,version);
+                        i++;
+                        continue;
                       }
                     }
-                    else
-                    {
-                      // Item has vanished
-                      if (Logging.connectors.isDebugEnabled())
-                        Logging.connectors.debug("SharePoint: Item metadata fetch failure indicated that item is gone: '"+documentIdentifier+"' - removing");
-                      activities.deleteDocument(documentIdentifier,version);
-                      i++;
-                      continue;
-                    }
-                  }
 
-                  activities.ingestDocument( documentIdentifier, version, itemUrl , data );
-                }
-                finally
-                {
-                  try
-                  {
-                    is.close();
+                    activities.ingestDocument( documentIdentifier, version, itemUrl , data );
                   }
-                  catch (InterruptedIOException e)
-                  {
-                    throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
-                  }
-                  catch (IOException e)
+                  finally
                   {
-                    // This should never happen; we're closing a bytearrayinputstream
+                    try
+                    {
+                      is.close();
+                    }
+                    catch (InterruptedIOException e)
+                    {
+                      throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
+                    }
+                    catch (IOException e)
+                    {
+                      // This should never happen; we're closing a bytearrayinputstream
+                    }
                   }
                 }
+                else
+                  // Document too long (should never happen; length is 0)
+                  activities.deleteDocument( documentIdentifier, version );
               }
-              else
-                // Document too long (should never happen; length is 0)
-                activities.deleteDocument( documentIdentifier, version );
+            }
+            else
+            {
+              // == List item attachment identifier ==
+              // MHL
             }
           }
         }