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 2014/06/11 14:07:58 UTC
svn commit: r1601866 - in /manifoldcf/branches/CONNECTORS-961:
connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/
Author: kwright
Date: Wed Jun 11 12:07:58 2014
New Revision: 1601866
URL: http://svn.apache.org/r1601866
Log:
Debug
Modified:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
manifoldcf/branches/CONNECTORS-961/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Modified: manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js?rev=1601866&r1=1601865&r2=1601866&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js (original)
+++ manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js Wed Jun 11 12:07:58 2014
@@ -18,33 +18,33 @@
<script type="text/javascript">
<!--
-function s$SeqNum_AddForcedMetadata()
+function s${SeqNum}_AddForcedMetadata()
{
- if (editjob.s$SeqNum_forcedmetadata_name.value == "")
+ if (editjob.s${SeqNum}_forcedmetadata_name.value == "")
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ForcedMetadata.ForcedMetadataNameMustNotBeNull'))");
- editjob.s$SeqNum_forcedmetadata_name.focus();
+ editjob.s${SeqNum}_forcedmetadata_name.focus();
return;
}
- document.editjob.s$SeqNum_forcedmetadata_op.value="Add";
- postFormSetAnchor("s$SeqNum_forcedmetadata_tag");
+ document.editjob.s${SeqNum}_forcedmetadata_op.value="Add";
+ postFormSetAnchor("s${SeqNum}_forcedmetadata_tag");
}
-function s$SeqNum_DeleteForcedMetadata(n)
+function s${SeqNum}_DeleteForcedMetadata(n)
{
- eval("document.editjob.s$SeqNum_forcedmetadata_"+n+"_op.value = 'Delete'");
+ eval("document.editjob.s${SeqNum}_forcedmetadata_"+n+"_op.value = 'Delete'");
if (n == 0)
- postFormSetAnchor("s$SeqNum_forcedmetadata_tag");
+ postFormSetAnchor("s${SeqNum}_forcedmetadata_tag");
else
- postFormSetAnchor("s$SeqNum_forcedmetadata_"+(n-1)+"_tag");
+ postFormSetAnchor("s${SeqNum}_forcedmetadata_"+(n-1)+"_tag");
}
-function s$SeqNum_checkSpecificationForSave()
+function s${SeqNum}_checkSpecificationForSave()
{
return true;
}
-function s$SeqNum_checkSpecification()
+function s${SeqNum}_checkSpecification()
{
return true;
}
Modified: manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html?rev=1601866&r1=1601865&r2=1601866&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html (original)
+++ manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html Wed Jun 11 12:07:58 2014
@@ -38,11 +38,11 @@
<tr class="oddformrow">
#end
<td class="formcolumncell">
- <a name="s$SeqNum_forcedmetadata_$paramcounter_tag"/>
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Delete'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Deleteforcedmetadatanumber'))$paramcounter" onclick='javascript:DeleteForcedMetadata_$SeqNum("$paramcounter");'/>
- <input type="hidden" name="s$SeqNum_forcedmetadata_$paramcounter_op" value="Continue"/>
- <input type="hidden" name="s$SeqNum_forcedmetadata_$paramcounter_name" value="$Encoder.attributeEscape($paramrecord.get('parameter')"/>
- <input type="hidden" name="s$SeqNum_forcedmetadata_$paramcounter_value" value="$Encoder.attributeEscape($paramrecord.get('value')"/>
+ <a name="s${SeqNum}_forcedmetadata_$paramcounter_tag"/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Delete'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Deleteforcedmetadatanumber'))$paramcounter" onclick='javascript:s${SeqNum}_DeleteForcedMetadata("$paramcounter");'/>
+ <input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_op" value="Continue"/>
+ <input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_name" value="$Encoder.attributeEscape($paramrecord.get('parameter')"/>
+ <input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_value" value="$Encoder.attributeEscape($paramrecord.get('value')"/>
</td>
<td class="formcolumncell">
<nobr>$Encoder.bodyEscape($paramrecord.get('parameter'))</nobr>
@@ -59,16 +59,16 @@
<tr class="formrow"><td colspan="3" class="formseparator"><hr/></td></tr>
<tr class="formrow">
<td class="formcolumncell">
- <a name="s$SeqNum_forcedmetadata_tag"/>
- <input type="hidden" name="s$SeqNum_forcedmetadata_op" value="Continue"/>
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Add'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Addforcedmetadata'))" onclick="javascript:AddForcedMetadata();"/>
- <input type="hidden" name="s$SeqNum_forcedmetadata_count" value="$paramcounter"/>
+ <a name="s${SeqNum}_forcedmetadata_tag"/>
+ <input type="hidden" name="s${SeqNum}_forcedmetadata_op" value="Continue"/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Add'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Addforcedmetadata'))" onclick="javascript:s${SeqNum}_AddForcedMetadata();"/>
+ <input type="hidden" name="s${SeqNum}_forcedmetadata_count" value="$paramcounter"/>
</td>
<td class="formcolumncell">
- <input type="text" name="s$SeqNum_forcedmetadata_name" size="30" value=""/>
+ <input type="text" name="s${SeqNum}_forcedmetadata_name" size="30" value=""/>
</td>
<td class="formcolumncell">
- <input type="text" name="s$SeqNum_forcedmetadata_value" size="30" value=""/>
+ <input type="text" name="s${SeqNum}_forcedmetadata_value" size="30" value=""/>
</td>
</tr>
</table>
@@ -80,9 +80,9 @@
#set($paramcounter = 0)
#foreach($paramrecord in $Parameters)
-<input type="hidden" name="s$SeqNum_forcedmetadata_$paramcounter_name" value="$Encoder.attributeEscape($paramrecord.get('parameter'))" />
-<input type="hidden" name="s$SeqNum_forcedmetadata_$paramcounter_value" value="$Encoder.attributeEscape($paramrecord.get('value'))" />
+<input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_name" value="$Encoder.attributeEscape($paramrecord.get('parameter'))" />
+<input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_value" value="$Encoder.attributeEscape($paramrecord.get('value'))" />
#end
-<input type="hidden" name="s$SeqNum_forcedmetadata_count" value="$paramcounter"/>
+<input type="hidden" name="s${SeqNum}_forcedmetadata_count" value="$paramcounter"/>
#end
Modified: manifoldcf/branches/CONNECTORS-961/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1601866&r1=1601865&r2=1601866&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-961/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ manifoldcf/branches/CONNECTORS-961/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Wed Jun 11 12:07:58 2014
@@ -562,6 +562,9 @@ public class JobManager implements IJobM
{
// Query for the matching jobs, and then for each job potentially adjust the state
Long[] jobIDs = jobs.findJobsMatchingTransformations(list);
+ if (jobIDs.length == 0)
+ return;
+
StringBuilder query = new StringBuilder();
ArrayList newList = new ArrayList();
@@ -618,6 +621,9 @@ public class JobManager implements IJobM
{
// Query for the matching jobs, and then for each job potentially adjust the state
Long[] jobIDs = jobs.findJobsMatchingTransformations(list);
+ if (jobIDs.length == 0)
+ return;
+
StringBuilder query = new StringBuilder();
ArrayList newList = new ArrayList();