manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1569218 - in /manifoldcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ framework/pull-age...
Date Tue, 18 Feb 2014 07:29:34 GMT
Author: kwright
Date: Tue Feb 18 07:29:33 2014
New Revision: 1569218

URL: http://svn.apache.org/r1569218
Log:
Fix for CONNECTORS-892.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
    manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Feb 18 07:29:33 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.6-dev =====================
 
+CONNECTORS-892: Add ability in UI reset incremental job seeding state.
+(Karl Wright)
+
 CONNECTORS-891: SharePoint AD groups not properly authorized.
 (Will Parkinson, Karl Wright)
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp Tue Feb 18 07:29:33
2014
@@ -1136,6 +1136,28 @@
 <%
 				}
 			}
+			else if (op.equals("StartOver"))
+			{
+				try
+				{
+					String jobID = variableContext.getParameter("jobid");
+					if (jobID == null)
+						throw new ManifoldCFException("Missing job parameter");
+					manager.clearJobSeedingState(new Long(jobID));
+%>
+					<jsp:forward page="listjobs.jsp"/>
+<%
+				}
+				catch (ManifoldCFException e)
+				{
+					e.printStackTrace();
+					variableContext.setParameter("text",e.getMessage());
+					variableContext.setParameter("target","listjobs.jsp");
+%>
+					<jsp:forward page="error.jsp"/>
+<%
+				}
+			}
 			else if (op.equals("Delete"))
 			{
 				try

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp Tue Feb 18 07:29:33
2014
@@ -45,6 +45,16 @@
 		}
 	}
 
+	function StartOver(jobID)
+	{
+		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewjob.StartOverConfirmation")%>"))
+		{
+			document.viewjob.op.value="StartOver";
+			document.viewjob.jobid.value=jobID;
+			document.viewjob.submit();
+		}
+	}
+
 	//-->
 	</script>
 
@@ -685,8 +695,15 @@
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
-		<tr><td class="message" colspan="4"><a href='<%="editjob.jsp?jobid="+jobID%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a>
-		&nbsp;<a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a>&nbsp;<a
href='<%="editjob.jsp?origjobid="+jobID%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a></td>
+		<tr>
+			<td class="message" colspan="4">
+				<nobr>
+					<a href='<%="editjob.jsp?jobid="+jobID%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a>
+					<a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a>
+					<a href='<%="editjob.jsp?origjobid="+jobID%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a>
+					<a href='<%="javascript:StartOver(\""+jobID+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.ResetSeedingThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ResetSeeding")%></a>
+				</nobr>
+			</td>
 		</tr>
 		</table>
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
Tue Feb 18 07:29:33 2014
@@ -132,6 +132,12 @@ public interface IJobManager
   public IJobDescription[] findJobsForConnection(String connectionName)
     throws ManifoldCFException;
 
+  /** Clear job seeding state.
+  *@param jobID is the job ID.
+  */
+  public void clearJobSeedingState(Long jobID)
+    throws ManifoldCFException;
+
   // These methods cover activities that require interaction with the job queue.
   // The job queue is maintained underneath this interface, and all threads that perform
   // job activities need to go through this layer.

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=1569218&r1=1569217&r2=1569218&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
Tue Feb 18 07:29:33 2014
@@ -639,6 +639,16 @@ public class JobManager implements IJobM
     return jobs.findJobsForConnection(connectionName);
   }
 
+  /** Clear job seeding state.
+  *@param jobID is the job ID.
+  */
+  @Override
+  public void clearJobSeedingState(Long jobID)
+    throws ManifoldCFException
+  {
+    jobs.clearSeedingState(jobID);
+  }
+
   // These methods cover activities that require interaction with the job queue.
   // The job queue is maintained underneath this interface, and all threads that perform
   // job activities need to go through this layer.

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
Tue Feb 18 07:29:33 2014
@@ -951,6 +951,20 @@ public class Jobs extends org.apache.man
     }
   }
 
+  /** Clear seeding state for a job.
+  *@param jobID is the job whose state should be cleared.
+  */
+  public void clearSeedingState(Long jobID)
+    throws ManifoldCFException
+  {
+    Map values = new HashMap();
+    values.put(lastCheckTimeField,null);
+    ArrayList params = new ArrayList();
+    String query = buildConjunctionClause(params,new ClauseDescription[]{
+      new UnitaryClause(idField,jobID)});
+    performUpdate(values,"WHERE "+query,params,null);
+  }
+
   /** This method is called on a restart.
   *@param processID is the process to be restarting.
   */

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Tue Feb 18 07:29:33 2014
@@ -2983,6 +2983,24 @@ public class ManifoldCF extends org.apac
     }
     return WRITERESULT_FOUND;
   }
+
+  /** Reset incremental seeding for a job.
+  */
+  protected static int apiWriteReseedJob(IThreadContext tc, Configuration output, Long jobID)
+    throws ManifoldCFException
+  {
+    try
+    {
+      IJobManager jobManager = JobManagerFactory.make(tc);
+      jobManager.clearJobSeedingState(jobID);
+      return WRITERESULT_CREATED;
+    }
+    catch (ManifoldCFException e)
+    {
+      createErrorNode(output,e);
+    }
+    return WRITERESULT_FOUND;
+  }
   
   /** Write job.
   */
@@ -3197,7 +3215,7 @@ public class ManifoldCF extends org.apac
     return WRITERESULT_FOUND;
   }
 
-  /** Reset output connection.
+  /** Reset output connection (reset version of all recorded documents).
   */
   protected static int apiWriteResetOutputConnection(IThreadContext tc, Configuration output,
String connectionName)
     throws ManifoldCFException
@@ -3213,6 +3231,23 @@ public class ManifoldCF extends org.apac
     }
     return WRITERESULT_FOUND;
   }
+
+  /** Clear output connection (remove all recorded documents).
+  */
+  protected static int apiWriteClearOutputConnection(IThreadContext tc, Configuration output,
String connectionName)
+    throws ManifoldCFException
+  {
+    try
+    {
+      signalOutputConnectionRemoved(tc,connectionName);
+      return WRITERESULT_CREATED;
+    }
+    catch (ManifoldCFException e)
+    {
+      createErrorNode(output,e);
+    }
+    return WRITERESULT_FOUND;
+  }
   
   /** Execute specified write command.
   *@param tc is the thread context.
@@ -3259,6 +3294,11 @@ public class ManifoldCF extends org.apac
       Long jobID = new Long(path.substring("resume/".length()));
       return apiWriteResumeJob(tc,output,jobID);
     }
+    else if (path.startsWith("reseed/"))
+    {
+      Long jobID = new Long(path.substring("reseed/".length()));
+      return apiWriteReseedJob(tc,output,jobID);
+    }
     else if (path.startsWith("jobs/"))
     {
       Long jobID = new Long(path.substring("jobs/".length()));
@@ -3312,6 +3352,29 @@ public class ManifoldCF extends org.apac
         return WRITERESULT_NOTFOUND;
       }
     }
+    else if (path.startsWith("clear/"))
+    {
+      int firstSeparator = "clear/".length();
+      int secondSeparator = path.indexOf("/",firstSeparator);
+      if (secondSeparator == -1)
+      {
+        createErrorNode(output,"Need connection name.");
+        return WRITERESULT_NOTFOUND;
+      }
+      
+      String connectionType = path.substring(firstSeparator,secondSeparator);
+      String connectionName = decodeAPIPathElement(path.substring(secondSeparator+1));
+      
+      if (connectionType.equals("outputconnections"))
+      {
+        return apiWriteClearOutputConnection(tc,output,connectionName);
+      }
+      else
+      {
+        createErrorNode(output,"Unknown connection type '"+connectionType+"'.");
+        return WRITERESULT_NOTFOUND;
+      }
+    }
     else
     {
       createErrorNode(output,"Unrecognized resource.");

Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
(original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
Tue Feb 18 07:29:33 2014
@@ -134,8 +134,8 @@ viewoutput.ReIngestAllAssociatedDocument
 viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection=Remove all document records
associated with this output connection
 viewoutput.RemoveAllAssociatedDocuments=Remove all associated documents
 viewoutput.Deleteoutputconnection=Delete output connection
-viewoutput.Thiscommandwillforce=This command will force all documents associated with output\nconnection
-viewoutput.toberecrawled=to be recrawled the next time their associated\n jobs are started.
 Do you want to continue?
+viewoutput.Thiscommandwillforce=This command will force all discovered documents associated
with output\nconnection
+viewoutput.toberecrawled=to be re-indexed the next time their associated\n jobs are started.
 Do you want to continue?
 viewoutput.Thiscommandwillcause=This command will cause ManifoldCF to lose all current knowledge
of documents\n associated with output connection
 viewoutput.tobeforgotten=.  Do you want to continue?
 viewoutput.qmark=?
@@ -790,6 +790,8 @@ viewjob.Edit=Edit
 viewjob.EditThisJob=Edit this job
 viewjob.Copy=Copy
 viewjob.CopyThisJob=Copy this job
+viewjob.ResetSeeding=Reset Seeding
+viewjob.ResetSeedingThisJob=Reset seeding for this job
 viewjob.NameColon=Name:
 viewjob.OutputConnectionColon=Output connection:
 viewjob.RepositoryConnectionColon=Repository connection:
@@ -798,6 +800,7 @@ viewjob.StartMethodColon=Start method:
 viewjob.ForcedMetadataColon=Forced metadata:
 viewjob.NoForcedMetadata=No forced metadata
 viewjob.DeleteJobConfirmation=Warning: Deleting this job will remove all\nassociated documents
from the index.\nDo you want to proceed?
+viewjob.StartOverConfirmation=Warning: This action will cause all job documents to be checked
during the next job run.\nDo you want to proceed?
 viewjob.Notapplicable=Not applicable
 viewjob.Rescandocumentsdynamically=Rescan documents dynamically
 viewjob.Infinity=Infinity

Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
(original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Tue Feb 18 07:29:33 2014
@@ -791,6 +791,8 @@ viewjob.Edit=編集
 viewjob.EditThisJob=ジョブを編集
 viewjob.Copy=コピー
 viewjob.CopyThisJob=ジョブをコピー
+viewjob.ResetSeeding=Reset Seeding
+viewjob.ResetSeedingThisJob=Reset seeding for this job
 viewjob.NameColon=名前:
 viewjob.OutputConnectionColon=出力コネクション:
 viewjob.RepositoryConnectionColon=リポジトリコネクション:
@@ -799,6 +801,7 @@ viewjob.StartMethodColon=開始ã�
 viewjob.ForcedMetadataColon=強制メタデータ:
 viewjob.NoForcedMetadata=強制メタデータなし
 viewjob.DeleteJobConfirmation=警告: このジョブの削除をすると関連するドキュメントを全てインデックスから削除されます。\nよろしいですか?
+viewjob.StartOverConfirmation=Warning: This action will cause all job documents to be checked
during the next job run.\nDo you want to proceed?
 viewjob.Notapplicable=適用可能ではありません
 viewjob.Rescandocumentsdynamically=ドキュメントを動的に再スキャンします
 viewjob.Infinity=無限

Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
(original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml
Tue Feb 18 07:29:33 2014
@@ -94,7 +94,8 @@
             <tr><td>outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>DELETE</td><td>Delete
an output connection</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>status/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Check
the status of an output connection</td><td>N/A</td><td>{"check_result":<em>&lt;message&gt;</em>}
<strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>info/outputconnections/<em>&lt;encoded_connection_name&gt;</em>/<em>&lt;connector_specific_resource&gt;</em></td><td>GET</td><td>Retrieve
arbitrary connector-specific resource</td><td>N/A</td><td><em>&lt;response_data&gt;</em>
<strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}
<strong>OR</strong> {"service_interruption":<em>&lt;error_text&gt;</em>}</td></tr>
-            <tr><td>reset/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Forget
previous indexing state</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
+            <tr><td>reset/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Forget
previous indexed document versions</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
+            <tr><td>clear/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Remove
all previous indexing records</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>mappingconnections</td><td>GET</td><td>List
all mapping connections</td><td>N/A</td><td>{"mappingconnection":[<em>&lt;list_of_mapping_connection_objects&gt;</em>]}
<strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>mappingconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Get
a specific mapping connection</td><td>N/A</td><td>{"mappingconnection":<em>&lt;mapping_connection_object&gt;</em>}
<strong>OR</strong> { } <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>mappingconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Save
or create a mapping connection</td><td>{"mappingconnection":<em>&lt;mapping_connection_object&gt;</em>}</td><td>{
} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
@@ -127,6 +128,7 @@
             <tr><td>restartminimal/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Stop
and start a specified job, minimal run requested</td><td>N/A</td><td>{
} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>pause/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Pause
a specified job</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>resume/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Resume
a specified job</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
+            <tr><td>reseed/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Reset
incremental seeding for a specified job</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
 
             <tr><td>repositoryconnectionhistory/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Get
a history report</td><td><em>&lt;history_query_parameters&gt;</em></td><td>{"row":[{"column":[{"name":<em>&lt;col_name&gt;</em>,"value":<em>&lt;col_value&gt;</em>},
...]}, ...]} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>repositoryconnectionquery/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Get
a queue report</td><td><em>&lt;queue_query_parameters&gt;</em></td><td>{"row":[{"column":[{"name":<em>&lt;col_name&gt;</em>,"value":<em>&lt;col_value&gt;</em>},
...]}, ...]} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>

Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml?rev=1569218&r1=1569217&r2=1569218&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
(original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/programmatic-operation.xml
Tue Feb 18 07:29:33 2014
@@ -94,7 +94,8 @@
             <tr><td>outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>DELETE</td><td>Delete
an output connection</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>status/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Check
the status of an output connection</td><td>N/A</td><td>{"check_result":<em>&lt;message&gt;</em>}
<strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>info/outputconnections/<em>&lt;encoded_connection_name&gt;</em>/<em>&lt;connector_specific_resource&gt;</em></td><td>GET</td><td>Retrieve
arbitrary connector-specific resource</td><td>N/A</td><td><em>&lt;response_data&gt;</em>
<strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}
<strong>OR</strong> {"service_interruption":<em>&lt;error_text&gt;</em>}</td></tr>
-            <tr><td>reset/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Forget
previous indexing state</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
+            <tr><td>reset/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Forget
previous indexed document versions</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
+            <tr><td>clear/outputconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Remove
all previous indexing records</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>mappingconnections</td><td>GET</td><td>List
all mapping connections</td><td>N/A</td><td>{"mappingconnection":[<em>&lt;list_of_mapping_connection_objects&gt;</em>]}
<strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>mappingconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Get
a specific mapping connection</td><td>N/A</td><td>{"mappingconnection":<em>&lt;mapping_connection_object&gt;</em>}
<strong>OR</strong> { } <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>mappingconnections/<em>&lt;encoded_connection_name&gt;</em></td><td>PUT</td><td>Save
or create a mapping connection</td><td>{"mappingconnection":<em>&lt;mapping_connection_object&gt;</em>}</td><td>{
} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
@@ -127,6 +128,7 @@
             <tr><td>restartminimal/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Stop
and start a specified job, minimal run requested</td><td>N/A</td><td>{
} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>pause/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Pause
a specified job</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>resume/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Resume
a specified job</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
+            <tr><td>reseed/<em>&lt;job_id&gt;</em></td><td>PUT</td><td>Reset
incremental seeding for a specified job</td><td>N/A</td><td>{ } <strong>OR</strong>
{"error":<em>&lt;error_text&gt;</em>}</td></tr>
 
             <tr><td>repositoryconnectionhistory/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Get
a history report</td><td><em>&lt;history_query_parameters&gt;</em></td><td>{"row":[{"column":[{"name":<em>&lt;col_name&gt;</em>,"value":<em>&lt;col_value&gt;</em>},
...]}, ...]} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>
             <tr><td>repositoryconnectionquery/<em>&lt;encoded_connection_name&gt;</em></td><td>GET</td><td>Get
a queue report</td><td><em>&lt;queue_query_parameters&gt;</em></td><td>{"row":[{"column":[{"name":<em>&lt;col_name&gt;</em>,"value":<em>&lt;col_value&gt;</em>},
...]}, ...]} <strong>OR</strong> {"error":<em>&lt;error_text&gt;</em>}</td></tr>



Mime
View raw message