svn commit: r1616264 - in /manifoldcf/trunk: CHANGES.txt connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java

[kwright]

Author: kwright
Date: Wed Aug  6 16:12:51 2014
New Revision: 1616264

URL: http://svn.apache.org/r1616264
Log:
Tentative fix for CONNECTORS-1004.  Committed on behalf of Prasad Perera.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1616264&r1=1616263&r2=1616264&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Aug  6 16:12:51 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.7-dev =====================
 
+CONNECTORS-1004: CMIS connector was not using latest version
+of document, which matters for repositories like Alfresco.
+(Prasad Perera, Karl Wright)
+
 CONNECTORS-1003: CMIS connector handling of query string was
 incorrect.
 (Karl Wright)

Modified: 
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1616264&r1=1616263&r2=1616264&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
 Wed Aug  6 16:12:51 2014
@@ -1112,6 +1112,7 @@ public class CmisRepositoryConnector ext
           // content ingestion
 
           Document document = (Document) cmisObject;
+          document = document.getObjectOfLatestVersion(false);
           long fileLength = document.getContentStreamLength();
           InputStream is = null;
           
@@ -1306,7 +1307,7 @@ public class CmisRepositoryConnector ext
     }
 
     getSession();
-    
+
     String[] rval = new String[documentIdentifiers.length];
     for (int i = 0; i < rval.length; i++) {
       CmisObject cmisObject;
@@ -1319,9 +1320,10 @@ public class CmisRepositoryConnector ext
 
       if (cmisObject.getBaseType().getId().equals(CMIS_DOCUMENT_BASE_TYPE)) {
         Document document = (Document) cmisObject;
-        
+
         //we have to check if this CMIS repository support versioning
         // or if the versioning is disabled for this content
+        document = document.getObjectOfLatestVersion(false);
         if(StringUtils.isNotEmpty(document.getVersionLabel())){
           rval[i] = document.getVersionLabel() + ":" + cmisQuery;
         } else {