Author: kwright
Date: Tue Dec 20 15:20:51 2016
New Revision: 1775305
URL: http://svn.apache.org/viewvc?rev=1775305&view=rev
Log:
Pull up fix for CONNECTORS-1361.
Modified:
manifoldcf/branches/release-2.6-branch/ (props changed)
manifoldcf/branches/release-2.6-branch/CHANGES.txt
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/zh_CN/programmatic-operation.xml
Propchange: manifoldcf/branches/release-2.6-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 15:20:51 2016
@@ -138,4 +138,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1774667,1774670
+/manifoldcf/trunk:1774667,1774670,1775304
Modified: manifoldcf/branches/release-2.6-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/CHANGES.txt?rev=1775305&r1=1775304&r2=1775305&view=diff
==============================================================================
--- manifoldcf/branches/release-2.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.6-branch/CHANGES.txt Tue Dec 20 15:20:51 2016
@@ -4,6 +4,9 @@ $Id$
======================= Release 2.6 =====================
+CONNECTORS-1361: The max_interval job field was missing from the API.
+(Cathal Mcguinness, Karl Wright)
+
CONNECTORS-1357: Delete button doesn't work on listnotifications
(Markus Schuch)
Modified:
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1775305&r1=1775304&r2=1775305&view=diff
==============================================================================
---
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
(original)
+++
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Tue Dec 20 15:20:51 2016
@@ -4464,6 +4464,7 @@ public class ManifoldCF extends org.apac
protected static final String JOBNODE_HOPCOUNTMODE = "hopcount_mode";
protected static final String JOBNODE_PRIORITY = "priority";
protected static final String JOBNODE_RECRAWLINTERVAL = "recrawl_interval";
+ protected static final String JOBNODE_MAXRECRAWLINTERVAL =
"max_recrawl_interval";
protected static final String JOBNODE_EXPIRATIONINTERVAL =
"expiration_interval";
protected static final String JOBNODE_RESEEDINTERVAL = "reseed_interval";
protected static final String JOBNODE_HOPCOUNT = "hopcount";
@@ -4626,6 +4627,10 @@ public class ManifoldCF extends org.apac
{
jobDescription.setInterval(interpretInterval(child.getValue()));
}
+ else if (childType.equals(JOBNODE_MAXRECRAWLINTERVAL))
+ {
+ jobDescription.setMaxInterval(interpretInterval(child.getValue()));
+ }
else if (childType.equals(JOBNODE_EXPIRATIONINTERVAL))
{
jobDescription.setExpiration(interpretInterval(child.getValue()));
@@ -4925,6 +4930,11 @@ public class ManifoldCF extends org.apac
child.setValue((job.getInterval()==null)?"infinite":job.getInterval().toString());
jobNode.addChild(jobNode.getChildCount(),child);
+ // Max recrawl interval
+ child = new ConfigurationNode(JOBNODE_MAXRECRAWLINTERVAL);
+
child.setValue((job.getMaxInterval()==null)?"infinite":job.getMaxInterval().toString());
+ jobNode.addChild(jobNode.getChildCount(),child);
+
child = new ConfigurationNode(JOBNODE_EXPIRATIONINTERVAL);
child.setValue((job.getExpiration()==null)?"infinite":job.getExpiration().toString());
jobNode.addChild(jobNode.getChildCount(),child);
Modified:
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml?rev=1775305&r1=1775304&r2=1775305&view=diff
==============================================================================
---
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
(original)
+++
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
Tue Dec 20 15:20:51 2016
@@ -490,6 +490,7 @@
<tr><td>"hopcount_mode"</td><td>The hopcount mode for the job,
which can be either "accurate", "no delete", "never delete"</td></tr>
<tr><td>"priority"</td><td>The job's priority, typically
"5"</td></tr>
<tr><td>"recrawl_interval"</td><td>The default time between
recrawl of documents (if the job is "continuous"), in milliseconds, or
"infinite" for infinity</td></tr>
+ <tr><td>"max_recrawl_interval"</td><td>The maximum time between
recrawl of documents (if the job is "continuous"), in milliseconds, or
"infinite" for infinity</td></tr>
<tr><td>"expiration_interval"</td><td>The time until a document
expires (if the job is "continuous"), in milliseconds, or "infinite" for
infinity</td></tr>
<tr><td>"reseed_interval"</td><td>The time between reseeding
operations (if the job is "continuous"), in milliseconds, or "infinite" for
infinity</td></tr>
<tr><td>"hopcount"</td><td>An array of hopcount objects,
describing the link types and associated maximum hops permitted for the
job</td></tr>
Modified:
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml?rev=1775305&r1=1775304&r2=1775305&view=diff
==============================================================================
---
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
(original)
+++
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
Tue Dec 20 15:20:51 2016
@@ -490,6 +490,7 @@
<tr><td>"hopcount_mode"</td><td>The hopcount mode for the job,
which can be either "accurate", "no delete", "never delete"</td></tr>
<tr><td>"priority"</td><td>The job's priority, typically
"5"</td></tr>
<tr><td>"recrawl_interval"</td><td>The default time between
recrawl of documents (if the job is "continuous"), in milliseconds, or
"infinite" for infinity</td></tr>
+ <tr><td>"max_recrawl_interval"</td><td>The maximum time between
recrawl of documents (if the job is "continuous"), in milliseconds, or
"infinite" for infinity</td></tr>
<tr><td>"expiration_interval"</td><td>The time until a document
expires (if the job is "continuous"), in milliseconds, or "infinite" for
infinity</td></tr>
<tr><td>"reseed_interval"</td><td>The time between reseeding
operations (if the job is "continuous"), in milliseconds, or "infinite" for
infinity</td></tr>
<tr><td>"hopcount"</td><td>An array of hopcount objects,
describing the link types and associated maximum hops permitted for the
job</td></tr>
Modified:
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/zh_CN/programmatic-operation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/zh_CN/programmatic-operation.xml?rev=1775305&r1=1775304&r2=1775305&view=diff
==============================================================================
---
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/zh_CN/programmatic-operation.xml
(original)
+++
manifoldcf/branches/release-2.6-branch/site/src/documentation/content/xdocs/zh_CN/programmatic-operation.xml
Tue Dec 20 15:20:51 2016
@@ -490,6 +490,7 @@
<tr><td>"hopcount_mode"</td><td>The hopcount mode for the job,
which can be either "accurate", "no delete", "never delete"</td></tr>
<tr><td>"priority"</td><td>The job's priority, typically
"5"</td></tr>
<tr><td>"recrawl_interval"</td><td>The default time between
recrawl of documents (if the job is "continuous"), in milliseconds, or
"infinite" for infinity</td></tr>
+ <tr><td>"max_recrawl_interval"</td><td>The maximum time between
recrawl of documents (if the job is "continuous"), in milliseconds, or
"infinite" for infinity</td></tr>
<tr><td>"expiration_interval"</td><td>The time until a document
expires (if the job is "continuous"), in milliseconds, or "infinite" for
infinity</td></tr>
<tr><td>"reseed_interval"</td><td>The time between reseeding
operations (if the job is "continuous"), in milliseconds, or "infinite" for
infinity</td></tr>
<tr><td>"hopcount"</td><td>An array of hopcount objects,
describing the link types and associated maximum hops permitted for the
job</td></tr>
