svn commit: r1733593 - in /manifoldcf/trunk: ./ framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/

[kw...@apache.org]

Author: kwright
Date: Fri Mar  4 13:03:23 2016
New Revision: 1733593

URL: http://svn.apache.org/viewvc?rev=1733593&view=rev
Log:
Fix for CONNECTORS-1283.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1733593&r1=1733592&r2=1733593&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Mar  4 13:03:23 2016
@@ -3,6 +3,13 @@ $Id$
 
 ======================= 2.4-dev =====================
 
+CONNECTORS-1283: "Document has no version" signal was not working.
+This problem has been around since MCF 1.8/2.0.  The fix is simple but
+may change the functioning of some custom repository connectors.  This
+fix also restores broken functionality in the MCF JDBC connector, when
+no document version query is provided.
+(Markus Schuch, Karl Wright)
+
 CONNECTORS-1282: Missing translation for Metadata Adjuster.
 (Markus Schuch, Karl Wright)
 

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1733593&r1=1733592&r2=1733593&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Fri Mar  4 13:03:23 2016
@@ -2746,7 +2746,10 @@ public class IncrementalIngester extends
         boolean needToReindex = (oldDocumentVersion == null);
         if (needToReindex == false)
         {
-          needToReindex = (!oldDocumentVersion.equals(newDocumentVersion) ||
+          // We need a way to signal that a document has no valid version string.
+          // That way is when the new document version string is empty.
+          needToReindex = (newDocumentVersion.length() == 0 ||
+            !oldDocumentVersion.equals(newDocumentVersion) ||
             !oldOutputVersion.equals(fullSpec.getStageDescriptionString(outputStage).getVersionString()) ||
             !oldAuthorityName.equals((newAuthorityNameString==null)?"":newAuthorityNameString));
         }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java?rev=1733593&r1=1733592&r2=1733593&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java Fri Mar  4 13:03:23 2016
@@ -146,7 +146,8 @@ public interface IProcessActivity extend
   /** Ingest the current document.
   *@param documentIdentifier is the document's identifier.
   *@param version is the version of the document, as reported by the getDocumentVersions() method of the
-  *       corresponding repository connector.
+  *       corresponding repository connector.  An empty version string signals that there is no calculable
+  *       document version string, and that the document should always be indexed.
   *@param documentURI is the URI to use to retrieve this document from the search interface (and is
   *       also the unique key in the index).
   *@param data is the document data.  The data is closed after ingestion is complete.