svn commit: r1537557 - in /manifoldcf/trunk: CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

[kwright]

Author: kwright
Date: Thu Oct 31 17:05:40 2013
New Revision: 1537557

URL: http://svn.apache.org/r1537557
Log:
Fix for CONNECTORS-797.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1537557&r1=1537556&r2=1537557&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Oct 31 17:05:40 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.5-dev =====================
 
+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/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1537557&r1=1537556&r2=1537557&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
 Thu Oct 31 17:05:40 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));