Author: kwright
Date: Tue Jun 17 11:48:20 2014
New Revision: 1603135
URL: http://svn.apache.org/r1603135
Log:
More debugging
Modified:
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/viewjob.jsp
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
Modified:
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1603135&r1=1603134&r2=1603135&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
Tue Jun 17 11:48:20 2014
@@ -1121,7 +1121,7 @@
<td
class="formcolumncell"><%=pipelineType%>
<input
name="pipeline_<%=j%>_isoutput" type="hidden"
value='<%=pipelineIsOutputs[j]?"true":"false"%>'/>
</td>
- <td
class="formcolumncell"><%=(pipelinePrerequisites[j] + 2)%>
+ <td
class="formcolumncell"><%=(pipelinePrerequisites[j] + 2)%>.
<input
name="pipeline_<%=j%>_precedent" type="hidden"
value="<%=pipelinePrerequisites[j]%>"/>
</td>
<td
class="formcolumncell">
Modified:
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1603135&r1=1603134&r2=1603135&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/viewjob.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/viewjob.jsp
Tue Jun 17 11:48:20 2014
@@ -680,7 +680,10 @@
}
%>
<tr>
- <td class="separator" colspan="4">1.<hr/></td>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
+ <td class="message" colspan="4">1.</td>
</tr>
<tr>
<td colspan="4">
@@ -708,7 +711,10 @@
{
%>
<tr>
- <td class="separator"
colspan="4"><%=(j+2)%>.<hr/></td>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
+ <td class="message" colspan="4"><%=(j+2)%>.</td>
</tr>
<tr>
<td colspan="4">
Modified:
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java?rev=1603135&r1=1603134&r2=1603135&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
Tue Jun 17 11:48:20 2014
@@ -174,11 +174,22 @@ public class PipelineManager extends org
query.append(buildConjunctionClause(newList,new ClauseDescription[]{
new UnitaryClause(ownerIDField,ownerID)}));
IResultSet set = performQuery(query.toString(),newList,null,null);
- String[] rval = new String[set.getRowCount()];
+ int count = 0;
for (int i = 0; i < set.getRowCount(); i++)
{
IResultRow row = set.getRow(i);
- rval[i] = (String)row.getValue(transformationNameField);
+ String value = (String)row.getValue(transformationNameField);
+ if (value != null && value.length() > 0)
+ count++;
+ }
+ String[] rval = new String[count];
+ count = 0;
+ for (int i = 0; i < set.getRowCount(); i++)
+ {
+ IResultRow row = set.getRow(i);
+ String value = (String)row.getValue(transformationNameField);
+ if (value != null && value.length() > 0)
+ rval[count++] = value;
}
return rval;
}
@@ -196,11 +207,22 @@ public class PipelineManager extends org
query.append(buildConjunctionClause(newList,new ClauseDescription[]{
new UnitaryClause(ownerIDField,ownerID)}));
IResultSet set = performQuery(query.toString(),newList,null,null);
- String[] rval = new String[set.getRowCount()];
+ int count = 0;
+ for (int i = 0; i < set.getRowCount(); i++)
+ {
+ IResultRow row = set.getRow(i);
+ String value = (String)row.getValue(outputNameField);
+ if (value != null && value.length() > 0)
+ count++;
+ }
+ String[] rval = new String[count];
+ count = 0;
for (int i = 0; i < set.getRowCount(); i++)
{
IResultRow row = set.getRow(i);
- rval[i] = (String)row.getValue(outputNameField);
+ String value = (String)row.getValue(outputNameField);
+ if (value != null && value.length() > 0)
+ rval[count++] = value;
}
return rval;
}
@@ -326,7 +348,6 @@ public class PipelineManager extends org
map.put(connectionDescriptionField,pipelineStageDescription);
map.put(connectionSpecField,os.toXML());
performInsert(map,null);
- i++;
}
}
catch (ManifoldCFException e)
