svn commit: r1541192 - in /manifoldcf/branches/release-1.4-branch: ./ CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

[kwright]

Author: kwright
Date: Tue Nov 12 18:35:53 2013
New Revision: 1541192

URL: http://svn.apache.org/r1541192
Log:
Pull up fix for CONNECTORS-797.

Modified:
    manifoldcf/branches/release-1.4-branch/   (props changed)
    manifoldcf/branches/release-1.4-branch/CHANGES.txt
    
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

Propchange: manifoldcf/branches/release-1.4-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1537557

Modified: manifoldcf/branches/release-1.4-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/CHANGES.txt?rev=1541192&r1=1541191&r2=1541192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.4-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.4-branch/CHANGES.txt Tue Nov 12 18:35:53 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= Release 1.4.1 =====================
 
+CONNECTORS-797: Bad query when maxcount was exceeded in the
+database table for the jobstatus screen.
+(Graeme Seaton, Karl Wright)
+
 CONNECTORS-796: Fix NPE in RSS connector having to do with
 tags that aren't nested as expected.
 (Benjamin Brandmeier, Karl Wright)

Modified: 
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1541192&r1=1541191&r2=1541192&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
 (original)
+++ 
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
 Tue Nov 12 18:35:53 2013
@@ -7494,6 +7494,7 @@ public class JobManager implements IJobM
       sb.append(database.constructCountClause(JobQueue.docHashField)).append(" 
AS doccount")
         .append(" FROM ").append(jobQueue.getTableName()).append(" WHERE ");
       sb.append(database.buildConjunctionClause(list,new 
ClauseDescription[]{new UnitaryClause(Jobs.idField,jobID)}));
+      sb.append(" AND ");
       sb.append(database.buildConjunctionClause(list,new 
ClauseDescription[]{buildOutstandingClause()}));
       sb.append(" 
").append(database.constructOffsetLimitClause(0,maxCount+1,false));
       
@@ -7518,6 +7519,7 @@ public class JobManager implements IJobM
       sb.append(database.constructCountClause(JobQueue.docHashField)).append(" 
AS doccount")
         .append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ");
       sb.append(database.buildConjunctionClause(list,new 
ClauseDescription[]{new UnitaryClause(Jobs.idField,jobID)}));
+      sb.append(" AND ");
       sb.append(database.buildConjunctionClause(list,new 
ClauseDescription[]{buildProcessedClause()}));
       sb.append(" 
").append(database.constructOffsetLimitClause(0,maxCount+1,false));