manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1640926 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt framework/ framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Date Fri, 21 Nov 2014 14:54:03 GMT
Author: kwright
Date: Fri Nov 21 14:54:03 2014
New Revision: 1640926

URL: http://svn.apache.org/r1640926
Log:
Pull up change for CONNECTORS-1110 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    manifoldcf/branches/dev_1x/framework/   (props changed)
    manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1640925

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1640926&r1=1640925&r2=1640926&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Nov 21 14:54:03 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1110: Component documents getting deleted wrongly
+when additional components added.
+(Markus Schuch, Karl Wright)
+
 CONNECTORS-1109: Bad cache key for JDBC authority.
 (Alejandro Calbazana, Karl Wright)
 

Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk/framework:r1640925

Modified: manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1640926&r1=1640925&r2=1640926&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
(original)
+++ manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Fri Nov 21 14:54:03 2014
@@ -3390,9 +3390,21 @@ public class IncrementalIngester extends
         {
           // See what uri was used before for this doc, if any
           ArrayList list = new ArrayList();
-          String query = buildConjunctionClause(list,new ClauseDescription[]{
-            new UnitaryClause(docKeyField,docKey),
-            new UnitaryClause(outputConnNameField,outputConnectionName)});
+          String query;
+          if (componentHash == null || componentHash.length() == 0)
+          {
+            query = buildConjunctionClause(list,new ClauseDescription[]{
+              new UnitaryClause(docKeyField,docKey),
+              new UnitaryClause(outputConnNameField,outputConnectionName),
+              new NullCheckClause(componentHashField,true)});
+          }
+          else
+          {
+            query = buildConjunctionClause(list,new ClauseDescription[]{
+              new UnitaryClause(docKeyField,docKey),
+              new UnitaryClause(outputConnNameField,outputConnectionName),
+              new UnitaryClause(componentHashField,componentHash)});
+          }
             
           IResultSet set = performQuery("SELECT "+docURIField+","+uriHashField+","+lastOutputVersionField+"
FROM "+getTableName()+
             " WHERE "+query,list,null,null);



Mime
View raw message