You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by pi...@apache.org on 2014/06/05 13:04:56 UTC

svn commit: r1600598 - in /manifoldcf/trunk: ./ connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/

Author: piergiorgio
Date: Thu Jun  5 11:04:55 2014
New Revision: 1600598

URL: http://svn.apache.org/r1600598
Log:
- now the cmis:objectId is automatically added when needed in the CMIS Connector query (CONNECTORS-948)

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

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1600598&r1=1600597&r2=1600598&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Jun  5 11:04:55 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.7-dev =====================
 
+CONNECTORS-948: CMIS Connector returns couldn't encrypt null when the query doesn't include cmis:objectId
+(Piergiorgio Lucidi)
+
 CONNECTORS-947: ant test fails when make-deps is not run.
 (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=1600598&r1=1600597&r2=1600598&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 Thu Jun  5 11:04:55 2014
@@ -50,6 +50,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.exceptions.CmisConnectionException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException;
 import org.apache.chemistry.opencmis.commons.impl.Constants;
+import org.apache.commons.io.input.NullInputStream;
 import org.apache.commons.lang.StringUtils;
 import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
 import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
@@ -66,8 +67,6 @@ import org.apache.manifoldcf.crawler.int
 import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
 import org.apache.manifoldcf.crawler.system.Logging;
 
-import org.apache.commons.io.input.NullInputStream;
-
 /**
  * This is the "repository connector" for a CMIS-compliant repository.
  * 
@@ -667,6 +666,7 @@ public class CmisRepositoryConnector ext
         activities.addSeedDocument(cmisObject.getId());
       }
     } else {
+      cmisQuery = CmisRepositoryConnectorUtils.getCmisQueryWithObjectId(cmisQuery);
       ItemIterable<QueryResult> results = session.query(cmisQuery, false).getPage(1000000000);
       for (QueryResult result : results) {
         String id = result.getPropertyValueById(PropertyIds.OBJECT_ID);
@@ -675,6 +675,8 @@ public class CmisRepositoryConnector ext
     }
 
   }
+  
+  
 
   /** 
    * Get the maximum number of documents to amalgamate together into one batch, for this connector.

Modified: manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnectorUtils.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnectorUtils.java?rev=1600598&r1=1600597&r2=1600598&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnectorUtils.java (original)
+++ manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnectorUtils.java Thu Jun  5 11:04:55 2014
@@ -19,11 +19,13 @@
 package org.apache.manifoldcf.crawler.connectors.cmis;
 
 import java.lang.reflect.Method;
+import java.util.StringTokenizer;
 
 import org.apache.chemistry.opencmis.client.api.Document;
 import org.apache.chemistry.opencmis.client.api.Session;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.AbstractAtomPubService;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.AtomPubParser;
+import org.apache.commons.lang.StringUtils;
 import org.apache.manifoldcf.crawler.system.Logging;
 
 /**
@@ -34,6 +36,10 @@ import org.apache.manifoldcf.crawler.sys
 public class CmisRepositoryConnectorUtils {
 
   private static final String LOAD_LINK_METHOD_NAME = "loadLink";
+  private static final String FROM_TOKEN = "from";
+  private static final String SEP = " ";
+  private static final String SELECT_STAR_CLAUSE = "select *";
+  private static final String OBJECT_ID_TERM = "cmis:objectId,";
   
   public static final String getDocumentURL(final Document document, final Session session) {
     String link = null;
@@ -53,4 +59,52 @@ public class CmisRepositoryConnectorUtil
     return link;
   }
   
+  /**
+   * Utility method to consider the objectId whenever it is not present in the select clause
+   * @param cmisQuery
+   * @return the cmisQuery with the cmis:objectId property added in the select clause
+   */
+  public static String getCmisQueryWithObjectId(String cmisQuery){
+    String cmisQueryResult = StringUtils.EMPTY;
+    StringTokenizer cmisQueryTokenized = new StringTokenizer(cmisQuery.trim());
+    String selectClause = StringUtils.EMPTY;
+    boolean firstTerm = true;
+    while(cmisQueryTokenized.hasMoreElements()){
+        String term = cmisQueryTokenized.nextToken();
+        if(!term.equalsIgnoreCase(FROM_TOKEN)){
+          if(firstTerm){
+            selectClause+=term;
+            firstTerm = false;
+          } else {
+            selectClause+=SEP+term;
+          }
+          
+        } else {
+          break;
+        }
+    }
+    
+    if(selectClause.equalsIgnoreCase(SELECT_STAR_CLAUSE)){
+      cmisQueryResult = cmisQuery;
+    } else {
+      //get the second term and add the cmis:objectId term
+      StringTokenizer selectClauseTokenized = new StringTokenizer(selectClause.trim());
+      boolean firstTermSelectClause = true;
+      String secondTerm = StringUtils.EMPTY;
+      while(selectClauseTokenized.hasMoreElements()){
+          String term = selectClauseTokenized.nextToken();
+          if(firstTermSelectClause){
+            firstTermSelectClause = false;
+          } else if(!firstTermSelectClause){
+            //this is the second term
+            secondTerm = term;
+            break;
+          }
+      }
+      cmisQueryResult = StringUtils.replaceOnce(cmisQuery, secondTerm, OBJECT_ID_TERM + secondTerm);
+    }
+    
+    return cmisQueryResult;
+  }
+  
 }
\ No newline at end of file