You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/10/31 19:11:10 UTC
svn commit: r1537568 - /manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

Author: kwright
Date: Thu Oct 31 18:11:10 2013
New Revision: 1537568

URL: http://svn.apache.org/r1537568
Log:
Fix a second match problem

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

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=1537568&r1=1537567&r2=1537568&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 18:11:10 2013
@@ -7470,7 +7470,7 @@ public class JobManager implements IJobM
       list.clear();
       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(database.buildConjunctionClause(list,new ClauseDescription[]{new UnitaryClause(JobQueue.jobIDField,jobID)}));
       sb.append(" ").append(database.constructOffsetLimitClause(0,maxCount+1,false));
       
       IResultSet totalSet = database.performQuery(sb.toString(),list,null,null);
@@ -7493,7 +7493,7 @@ public class JobManager implements IJobM
       list.clear();
       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(database.buildConjunctionClause(list,new ClauseDescription[]{new UnitaryClause(JobQueue.jobIDField,jobID)}));
       sb.append(" AND ");
       sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{buildOutstandingClause()}));
       sb.append(" ").append(database.constructOffsetLimitClause(0,maxCount+1,false));
@@ -7517,8 +7517,8 @@ public class JobManager implements IJobM
       sb = new StringBuilder("SELECT ");
       list.clear();
       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)}));
+        .append(" FROM ").append(jobQueue.getTableName()).append(" WHERE ");
+      sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{new UnitaryClause(JobQueue.jobIDField,jobID)}));
       sb.append(" AND ");
       sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{buildProcessedClause()}));
       sb.append(" ").append(database.constructOffsetLimitClause(0,maxCount+1,false));