manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1620301 - in /manifoldcf/trunk: ./ framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/ framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/ framework/crawler-ui/src/main/webapp/ framework/pull-...
Date Mon, 25 Aug 2014 12:13:36 GMT
Author: kwright
Date: Mon Aug 25 12:13:35 2014
New Revision: 1620301

URL: http://svn.apache.org/r1620301
Log:
Fix for CONNECTORS-972.

Removed:
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ForcedParamManager.java
    manifoldcf/trunk/site/src/documentation/resources/images/en_US/add-new-job-forced-metadata-example.PNG
    manifoldcf/trunk/site/src/documentation/resources/images/en_US/add-new-job-forced-metadata.PNG
    manifoldcf/trunk/site/src/documentation/resources/images/zh_CN/add-new-job-forced-metadata-example.PNG
    manifoldcf/trunk/site/src/documentation/resources/images/zh_CN/add-new-job-forced-metadata.PNG
Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/DocumentIngestStatus.java
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineSpecificationWithVersions.java
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
    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/IJobDescription.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.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/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecificationWithVersions.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/programmatic-operation.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Aug 25 12:13:35 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.0-dev =====================
 
+CONNECTORS-972: Remove Forced Metadata tab from all jobs.
+THIS IS A NON-BACKWARDS-COMPATIBLE CHANGE.
+(Karl Wright)
+
 CONNECTORS-949: Upgrade OpenCMIS to latest version to see if it
 fixes join queries.
 (Karl Wright)

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Mon Aug 25 12:13:35 2014
@@ -48,7 +48,6 @@ import java.io.*;
 * <tr><td>lastversion</td><td>LONGTEXT</td><td></td></tr>
 * <tr><td>lastoutputversion</td><td>LONGTEXT</td><td></td></tr>
 * <tr><td>lasttransformationversion</td><td>LONGTEXT</td><td></td></tr>
-* <tr><td>forcedparams</td><td>LONGTEXT</td><td></td></tr>
 * <tr><td>changecount</td><td>BIGINT</td><td></td></tr>
 * <tr><td>firstingest</td><td>BIGINT</td><td></td></tr>
 * <tr><td>lastingest</td><td>BIGINT</td><td></td></tr>
@@ -71,7 +70,6 @@ public class IncrementalIngester extends
   protected final static String lastVersionField = "lastversion";
   protected final static String lastOutputVersionField = "lastoutputversion";
   protected final static String lastTransformationVersionField = "lasttransformationversion";
-  protected final static String forcedParamsField = "forcedparams";
   protected final static String changeCountField = "changecount";
   protected final static String firstIngestField = "firstingest";
   protected final static String lastIngestField = "lastingest";
@@ -132,7 +130,6 @@ public class IncrementalIngester extends
         map.put(lastVersionField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
         map.put(lastOutputVersionField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
         map.put(lastTransformationVersionField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
-        map.put(forcedParamsField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
         map.put(changeCountField,new ColumnDescription("BIGINT",false,false,null,null,false));
         map.put(firstIngestField,new ColumnDescription("BIGINT",false,false,null,null,false));
         map.put(lastIngestField,new ColumnDescription("BIGINT",false,false,null,null,false));
@@ -141,32 +138,7 @@ public class IncrementalIngester extends
       }
       else
       {
-        // Schema upgrade from 1.1 to 1.2
-        ColumnDescription cd = (ColumnDescription)existing.get(forcedParamsField);
-        if (cd == null)
-        {
-          Map<String,ColumnDescription> addMap = new HashMap<String,ColumnDescription>();
-          addMap.put(forcedParamsField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
-          performAlter(addMap,null,null,null);
-        }
-        
-        // Schema upgrade from 1.6 to 1.7
-        cd = (ColumnDescription)existing.get(lastTransformationVersionField);
-        if (cd == null)
-        {
-          Map<String,ColumnDescription> addMap = new HashMap<String,ColumnDescription>();
-          addMap.put(lastTransformationVersionField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
-          performAlter(addMap,null,null,null);
-        }
-
-        cd = (ColumnDescription)existing.get(componentHashField);
-        if (cd == null)
-        {
-          Map<String,ColumnDescription> addMap = new HashMap<String,ColumnDescription>();
-          addMap.put(componentHashField,new ColumnDescription("VARCHAR(40)",false,true,null,null,false));
-          performAlter(addMap,null,null,null);
-        }
-
+        // Upgrades from 2.0 onward go here
       }
 
       // Now, do indexes
@@ -524,7 +496,6 @@ public class IncrementalIngester extends
   *@param pipelineSpecificationWithVersions is the pipeline specification including new version info for all transformation and output
   *  connections.
   *@param newDocumentVersion is the newly-determined document version.
-  *@param newParameterVersion is the newly-determined parameter version.
   *@param newAuthorityNameString is the newly-determined authority name.
   *@return true if the document needs to be refetched.
   */
@@ -532,7 +503,6 @@ public class IncrementalIngester extends
   public boolean checkFetchDocument(
     IPipelineSpecificationWithVersions pipelineSpecificationWithVersions,
     String newDocumentVersion,
-    String newParameterVersion,
     String newAuthorityNameString)
   {
     if (newAuthorityNameString == null)
@@ -544,7 +514,6 @@ public class IncrementalIngester extends
     {
       int stage = basicSpecification.getOutputStage(i);
       String oldDocumentVersion = pipelineSpecificationWithVersions.getOutputDocumentVersionString(i);
-      String oldParameterVersion = pipelineSpecificationWithVersions.getOutputParameterVersionString(i);
       String oldOutputVersion = pipelineSpecificationWithVersions.getOutputVersionString(i);
       String oldAuthorityName = pipelineSpecificationWithVersions.getAuthorityNameString(i);
       // If it looks like we never indexed this output before, we need to do it now.
@@ -552,7 +521,6 @@ public class IncrementalIngester extends
         return true;
       // Look first at the version strings that aren't pipeline dependent
       if (!oldDocumentVersion.equals(newDocumentVersion) ||
-        !oldParameterVersion.equals(newParameterVersion) ||
         !oldAuthorityName.equals(newAuthorityNameString) ||
         !oldOutputVersion.equals(pipelineSpecification.getStageDescriptionString(stage).getVersionString()))
         return true;
@@ -674,7 +642,7 @@ public class IncrementalIngester extends
 
       // If we get here, it means we are noting that the document was examined, but that no change was required.  This is signaled
       // to noteDocumentIngest by having the null documentURI.
-      noteDocumentIngest(outputConnectionName,docKey,componentHash,documentVersion,null,null,null,null,recordTime,null,null);
+      noteDocumentIngest(outputConnectionName,docKey,componentHash,documentVersion,null,null,null,recordTime,null,null);
     }
   }
 
@@ -688,7 +656,6 @@ public class IncrementalIngester extends
   *@param identifierHash is the hashed document identifier.
   *@param componentHash is the hashed component identifier, if any.
   *@param documentVersion is the document version.
-  *@param parameterVersion is the version string for the forced parameters.
   *@param authorityName is the name of the authority associated with the document, if any.
   *@param recordTime is the time at which the recording took place, in milliseconds since epoch.
   *@param activities is an object providing a set of methods that the implementer can use to perform the operation.
@@ -698,7 +665,6 @@ public class IncrementalIngester extends
     IPipelineSpecificationWithVersions pipelineSpecificationWithVersions,
     String identifierClass, String identifierHash, String componentHash,
     String documentVersion,
-    String parameterVersion,
     String authorityName,
     long recordTime,
     IOutputActivity activities)
@@ -720,7 +686,7 @@ public class IncrementalIngester extends
       throw new ServiceInterruption("Pipeline connector not installed",0L);
     try
     {
-      pipeline.noDocument(docKey,componentHash,documentVersion,parameterVersion,authorityName,activities,recordTime);
+      pipeline.noDocument(docKey,componentHash,documentVersion,authorityName,activities,recordTime);
     }
     finally
     {
@@ -738,7 +704,6 @@ public class IncrementalIngester extends
   *@param identifierHash is the hashed document identifier.
   *@param componentHash is the hashed component identifier, if any.
   *@param documentVersion is the document version.
-  *@param parameterVersion is the version string for the forced parameters.
   *@param authorityName is the name of the authority associated with the document, if any.
   *@param data is the document data.  The data is closed after ingestion is complete.
   *@param ingestTime is the time at which the ingestion took place, in milliseconds since epoch.
@@ -752,7 +717,6 @@ public class IncrementalIngester extends
     IPipelineSpecificationWithVersions pipelineSpecificationWithVersions,
     String identifierClass, String identifierHash, String componentHash,
     String documentVersion,
-    String parameterVersion,
     String authorityName,
     RepositoryDocument data,
     long ingestTime, String documentURI,
@@ -778,7 +742,7 @@ public class IncrementalIngester extends
       throw new ServiceInterruption("Pipeline connector not installed",0L);
     try
     {
-      return pipeline.addOrReplaceDocumentWithException(docKey,componentHash,documentURI,data,documentVersion,parameterVersion,authorityName,activities,ingestTime) == IPipelineConnector.DOCUMENTSTATUS_ACCEPTED;
+      return pipeline.addOrReplaceDocumentWithException(docKey,componentHash,documentURI,data,documentVersion,authorityName,activities,ingestTime) == IPipelineConnector.DOCUMENTSTATUS_ACCEPTED;
     }
     finally
     {
@@ -1814,7 +1778,7 @@ public class IncrementalIngester extends
       new MultiClause(outputConnNameField,outputConnectionNames)});
       
     // Get the primary records associated with this hash value
-    IResultSet set = performQuery("SELECT "+idField+","+outputConnNameField+","+docKeyField+","+componentHashField+","+lastVersionField+","+lastOutputVersionField+","+authorityNameField+","+forcedParamsField+","+lastTransformationVersionField+
+    IResultSet set = performQuery("SELECT "+idField+","+outputConnNameField+","+docKeyField+","+componentHashField+","+lastVersionField+","+lastOutputVersionField+","+authorityNameField+","+lastTransformationVersionField+
       " FROM "+getTableName()+" WHERE "+query,newList,null,null);
 
     // Now, go through the original request once more, this time building the result
@@ -1837,15 +1801,12 @@ public class IncrementalIngester extends
         String lastOutputVersion = (String)row.getValue(lastOutputVersionField);
         if (lastOutputVersion == null)
           lastOutputVersion = "";
-        String paramVersion = (String)row.getValue(forcedParamsField);
-        if (paramVersion == null)
-          paramVersion = "";
         String authorityName = (String)row.getValue(authorityNameField);
         if (authorityName == null)
           authorityName = "";
         int indexValue = position.intValue();
         rval.addStatus(identifierClasses[indexValue],identifierHashes[indexValue],outputConnectionName,
-          componentHash,new DocumentIngestStatus(lastVersion,lastTransformationVersion,lastOutputVersion,paramVersion,authorityName));
+          componentHash,new DocumentIngestStatus(lastVersion,lastTransformationVersion,lastOutputVersion,authorityName));
       }
     }
   }
@@ -2051,7 +2012,6 @@ public class IncrementalIngester extends
   *@param transformationVersion is a string describing all current transformations for the document.
   *@param outputVersion is the version string calculated for the output connection.
   *@param authorityNameString is the name of the relevant authority connection.
-  *@param packedForcedParameters is the string we use to determine differences in packed parameters.
   *@param ingestTime is the time at which the ingestion took place, in milliseconds since epoch.
   *@param documentURI is the uri the document can be accessed at, or null (which signals that we are to record the version, but no
   * ingestion took place).
@@ -2059,7 +2019,7 @@ public class IncrementalIngester extends
   */
   protected void noteDocumentIngest(String outputConnectionName,
     String docKey, String componentHash, String documentVersion, String transformationVersion,
-    String outputVersion, String packedForcedParameters,
+    String outputVersion,
     String authorityNameString,
     long ingestTime, String documentURI, String documentURIHash)
     throws ManifoldCFException
@@ -2092,7 +2052,6 @@ public class IncrementalIngester extends
       map.put(lastVersionField,documentVersion);
       map.put(lastTransformationVersionField,transformationVersion);
       map.put(lastOutputVersionField,outputVersion);
-      map.put(forcedParamsField,packedForcedParameters);
       map.put(lastIngestField,new Long(ingestTime));
       if (documentURI != null)
       {
@@ -2174,7 +2133,6 @@ public class IncrementalIngester extends
       map.put(lastVersionField,documentVersion);
       map.put(lastTransformationVersionField,transformationVersion);
       map.put(lastOutputVersionField,outputVersion);
-      map.put(forcedParamsField,packedForcedParameters);
       map.put(lastIngestField,new Long(ingestTime));
       if (documentURI != null)
       {
@@ -2726,22 +2684,22 @@ public class IncrementalIngester extends
       this.pipelineConnectionsWithVersions = pipelineConnectionsWithVersions;
     }
 
-    public int addOrReplaceDocumentWithException(String docKey, String componentHash, String documentURI, RepositoryDocument document, String newDocumentVersion, String newParameterVersion, String authorityNameString, IOutputActivity finalActivity, long ingestTime)
+    public int addOrReplaceDocumentWithException(String docKey, String componentHash, String documentURI, RepositoryDocument document, String newDocumentVersion, String authorityNameString, IOutputActivity finalActivity, long ingestTime)
       throws ManifoldCFException, ServiceInterruption, IOException
     {
-      PipelineAddFanout entryPoint = buildAddPipeline(finalActivity,newDocumentVersion,newParameterVersion,authorityNameString,ingestTime,docKey,componentHash);
+      PipelineAddFanout entryPoint = buildAddPipeline(finalActivity,newDocumentVersion,authorityNameString,ingestTime,docKey,componentHash);
       return entryPoint.sendDocument(documentURI,document);
     }
 
-    public void noDocument(String docKey, String componentHash, String newDocumentVersion, String newParameterVersion, String authorityNameString, IOutputActivity finalActivity, long ingestTime)
+    public void noDocument(String docKey, String componentHash, String newDocumentVersion, String authorityNameString, IOutputActivity finalActivity, long ingestTime)
       throws ManifoldCFException, ServiceInterruption
     {
-      PipelineAddFanout entryPoint = buildAddPipeline(finalActivity,newDocumentVersion,newParameterVersion,authorityNameString,ingestTime,docKey,componentHash);
+      PipelineAddFanout entryPoint = buildAddPipeline(finalActivity,newDocumentVersion,authorityNameString,ingestTime,docKey,componentHash);
       entryPoint.noDocument();
     }
 
     protected PipelineAddFanout buildAddPipeline(IOutputActivity finalActivity,
-      String newDocumentVersion, String newParameterVersion, String newAuthorityNameString,
+      String newDocumentVersion, String newAuthorityNameString,
       long ingestTime, String docKey, String componentHash)
     {
       // Algorithm for building a pipeline:
@@ -2765,7 +2723,6 @@ public class IncrementalIngester extends
         
         // Compute whether we need to reindex this record to this output or not, based on spec.
         String oldDocumentVersion = fullSpec.getOutputDocumentVersionString(i);
-        String oldParameterVersion = fullSpec.getOutputParameterVersionString(i);
         String oldOutputVersion = fullSpec.getOutputVersionString(i);
         String oldTransformationVersion = fullSpec.getOutputTransformationVersionString(i);
         String oldAuthorityName = fullSpec.getAuthorityNameString(i);
@@ -2777,7 +2734,6 @@ public class IncrementalIngester extends
         if (needToReindex == false)
         {
           needToReindex = (!oldDocumentVersion.equals(newDocumentVersion) ||
-            !oldParameterVersion.equals(newParameterVersion) ||
             !oldOutputVersion.equals(pipelineSpec.getStageDescriptionString(outputStage)) ||
             !oldAuthorityName.equals(newAuthorityNameString));
         }
@@ -2796,7 +2752,6 @@ public class IncrementalIngester extends
           newTransformationVersion,
           ingestTime,
           newDocumentVersion,
-          newParameterVersion,
           docKey,
           componentHash,
           newAuthorityNameString);
@@ -3238,7 +3193,6 @@ public class IncrementalIngester extends
     protected final String transformationVersion;
     protected final long ingestTime;
     protected final String documentVersion;
-    protected final String parameterVersion;
     protected final String docKey;
     protected final String componentHash;
     protected final IOutputActivity activity;
@@ -3251,7 +3205,6 @@ public class IncrementalIngester extends
       String transformationVersion,
       long ingestTime,
       String documentVersion,
-      String parameterVersion,
       String docKey,
       String componentHash,
       String authorityNameString)
@@ -3262,7 +3215,6 @@ public class IncrementalIngester extends
       this.transformationVersion = transformationVersion;
       this.ingestTime = ingestTime;
       this.documentVersion = documentVersion;
-      this.parameterVersion = parameterVersion;
       this.docKey = docKey;
       this.componentHash = componentHash;
       this.activity = activity;
@@ -3394,15 +3346,15 @@ public class IncrementalIngester extends
           // This is a marker that says "something is there"; it has an empty version, which indicates
           // that we don't know anything about it.  That means it will be reingested when the
           // next version comes along, and will be deleted if called for also.
-          noteDocumentIngest(outputConnectionName,docKey,componentHash,null,null,null,null,null,ingestTime,documentURI,documentURIHash);
+          noteDocumentIngest(outputConnectionName,docKey,componentHash,null,null,null,null,ingestTime,documentURI,documentURIHash);
           int result = super.addOrReplaceDocumentWithException(documentURI, document);
-          noteDocumentIngest(outputConnectionName,docKey,componentHash,documentVersion,transformationVersion,pipelineDescriptionString.getVersionString(),parameterVersion,authorityNameString,ingestTime,documentURI,documentURIHash);
+          noteDocumentIngest(outputConnectionName,docKey,componentHash,documentVersion,transformationVersion,pipelineDescriptionString.getVersionString(),authorityNameString,ingestTime,documentURI,documentURIHash);
           return result;
         }
 
         // If we get here, it means we are noting that the document was examined, but that no change was required.  This is signaled
         // to noteDocumentIngest by having the null documentURI.
-        noteDocumentIngest(outputConnectionName,docKey,componentHash,documentVersion,transformationVersion,pipelineDescriptionString.getVersionString(),parameterVersion,authorityNameString,ingestTime,null,null);
+        noteDocumentIngest(outputConnectionName,docKey,componentHash,documentVersion,transformationVersion,pipelineDescriptionString.getVersionString(),authorityNameString,ingestTime,null,null);
         return IPipelineConnector.DOCUMENTSTATUS_ACCEPTED;
       }
       finally
@@ -3550,18 +3502,16 @@ public class IncrementalIngester extends
   protected static class RuntPipelineSpecificationWithVersions extends RuntPipelineSpecification implements IPipelineSpecificationWithVersions
   {
     protected final String oldDocumentVersion;
-    protected final String oldParameterVersion;
     protected final String oldOutputVersion;
     protected final String oldTransformationVersion;
     protected final String oldAuthorityNameString;
     
     public RuntPipelineSpecificationWithVersions(String outputConnectionName, VersionContext outputDescriptionString,
-      String oldDocumentVersion, String oldParameterVersion, String oldOutputVersion, String oldTransformationVersion,
+      String oldDocumentVersion, String oldOutputVersion, String oldTransformationVersion,
       String oldAuthorityNameString)
     {
       super(outputConnectionName,outputDescriptionString);
       this.oldDocumentVersion = oldDocumentVersion;
-      this.oldParameterVersion = oldParameterVersion;
       this.oldOutputVersion = oldOutputVersion;
       this.oldTransformationVersion = oldTransformationVersion;
       this.oldAuthorityNameString = oldAuthorityNameString;
@@ -3588,18 +3538,6 @@ public class IncrementalIngester extends
       return null;
     }
     
-    /** For a given output index, return a parameter version string.
-    *@param index is the output index.
-    *@return the parameter version string.
-    */
-    @Override
-    public String getOutputParameterVersionString(int index)
-    {
-      if (index == 0)
-        return oldParameterVersion;
-      return null;
-    }
-
     /** For a given output index, return a transformation version string.
     *@param index is the output index.
     *@return the transformation version string.

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/DocumentIngestStatus.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/DocumentIngestStatus.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/DocumentIngestStatus.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/DocumentIngestStatus.java Mon Aug 25 12:13:35 2014
@@ -34,20 +34,18 @@ public class DocumentIngestStatus
   protected final String documentVersionString;
   protected final String transformationVersionString;
   protected final String outputVersionString;
-  protected final String parameterVersionString;
   protected final String documentAuthorityNameString;
 
   /** Constructor */
   public DocumentIngestStatus(
     String documentVersionString,
-    String transformationVersionString, String outputVersionString, String parameterVersionString,
+    String transformationVersionString, String outputVersionString,
     String documentAuthorityNameString)
   {
     // Looked-up information
     this.documentVersionString = documentVersionString;
     this.transformationVersionString = transformationVersionString;
     this.outputVersionString = outputVersionString;
-    this.parameterVersionString = parameterVersionString;
     this.documentAuthorityNameString = documentAuthorityNameString;
   }
 
@@ -69,12 +67,6 @@ public class DocumentIngestStatus
     return outputVersionString;
   }
 
-  /** Get the parameter version string */
-  public String getParameterVersion()
-  {
-    return parameterVersionString;
-  }
-  
   /** Get the document authority name string */
   public String getDocumentAuthorityNameString()
   {

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java Mon Aug 25 12:13:35 2014
@@ -146,14 +146,12 @@ public interface IIncrementalIngester
   *@param pipelineSpecificationWithVersions is the pipeline specification including new version info for all transformation and output
   *  connections.
   *@param newDocumentVersion is the newly-determined document version.
-  *@param newParameterVersion is the newly-determined parameter version.
   *@param newAuthorityNameString is the newly-determined authority name.
   *@return true if the document needs to be refetched.
   */
   public boolean checkFetchDocument(
     IPipelineSpecificationWithVersions pipelineSpecificationWithVersions,
     String newDocumentVersion,
-    String newParameterVersion,
     String newAuthorityNameString);
 
   /** Record a document version, but don't ingest it.
@@ -181,7 +179,6 @@ public interface IIncrementalIngester
   *@param identifierHash is the hashed document identifier.
   *@param componentHash is the hashed component identifier, if any.
   *@param documentVersion is the document version.
-  *@param parameterVersion is the version string for the forced parameters.
   *@param authorityName is the name of the authority associated with the document, if any.
   *@param recordTime is the time at which the recording took place, in milliseconds since epoch.
   *@param activities is an object providing a set of methods that the implementer can use to perform the operation.
@@ -190,7 +187,6 @@ public interface IIncrementalIngester
     IPipelineSpecificationWithVersions pipelineSpecificationWithVersions,
     String identifierClass, String identifierHash, String componentHash,
     String documentVersion,
-    String parameterVersion,
     String authorityName,
     long recordTime,
     IOutputActivity activities)
@@ -206,7 +202,6 @@ public interface IIncrementalIngester
   *@param identifierHash is the hashed document identifier.
   *@param componentHash is the hashed component identifier, if any.
   *@param documentVersion is the document version.
-  *@param parameterVersion is the version string for the forced parameters.
   *@param authorityName is the name of the authority associated with the document, if any.
   *@param data is the document data.  The data is closed after ingestion is complete.
   *@param ingestTime is the time at which the ingestion took place, in milliseconds since epoch.
@@ -219,7 +214,6 @@ public interface IIncrementalIngester
     IPipelineSpecificationWithVersions pipelineSpecificationWithVersions,
     String identifierClass, String identifierHash, String componentHash,
     String documentVersion,
-    String parameterVersion,
     String authorityName,
     RepositoryDocument data,
     long ingestTime, String documentURI,

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineSpecificationWithVersions.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineSpecificationWithVersions.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineSpecificationWithVersions.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineSpecificationWithVersions.java Mon Aug 25 12:13:35 2014
@@ -38,12 +38,6 @@ public interface IPipelineSpecificationW
   */
   public String getOutputDocumentVersionString(int index);
   
-  /** For a given output index, return a parameter version string.
-  *@param index is the output index.
-  *@return the parameter version string.
-  */
-  public String getOutputParameterVersionString(int index);
-
   /** For a given output index, return a transformation version string.
   *@param index is the output index.
   *@return the transformation version string.

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp Mon Aug 25 12:13:35 2014
@@ -118,8 +118,6 @@
 	int hopcountMode = IJobDescription.HOPCOUNT_ACCURATE;
 	// Hop filters
 	Map hopFilterMap = new HashMap();
-	// Forced metadata
-	Map<String,Set<String>> forcedMetadata = new HashMap<String,Set<String>>();
 
 	// If the job is not null, prepopulate everything with what comes from it.
 	if (job != null)
@@ -161,7 +159,6 @@
 		value = job.getExpiration();
 		expirationInterval = (value==null)?null:new Long(value.longValue()/60000L);
 		hopFilterMap = job.getHopCountFilters();
-		forcedMetadata = job.getForcedMetadata();
 	}
 
 
@@ -200,7 +197,6 @@
 			tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopFilters"));
 			sequenceArray.add(null);
 		}
-		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editjob.ForcedMetadata"));
 		sequenceArray.add(null);
 	}
 
@@ -440,27 +436,6 @@
 			postFormSetAnchor("remove_schedule_"+(n-1));
 	}
 
-	function AddForcedMetadata()
-	{
-		if (editjob.forcedmetadata_name.value == "")
-		{
-			alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editjob.ForcedMetadataNameMustNotBeNull")%>");
-			editjob.forcedmetadata_name.focus();
-			return;
-		}
-		document.editjob.forcedmetadata_op.value="Add";
-		postFormSetAnchor("forcedmetadata_tag");
-	}
-	
-	function DeleteForcedMetadata(n)
-	{
-		eval("document.editjob.forcedmetadata_"+n+"_op.value = 'Delete'");
-		if (n == 0)
-			postFormSetAnchor("forcedmetadata_tag");
-		else
-			postFormSetAnchor("forcedmetadata_"+(n-1)+"_tag");
-	}
-	
 	function checkForm()
 	{
 		if (!checkRecrawl())
@@ -828,115 +803,6 @@
 <%
 	}
 
-	// Forced Metadata tab
-	if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.ForcedMetadata")) && tabSequenceInt == -1)
-	{
-%>
-		  <table class="displaytable">
-			<tr>
-				<td class="separator" colspan="4"><hr/></td>
-			</tr>
-			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.ForcedMetadataColon")%></nobr></td>
-				<td class="boxcell" colspan="3">
-					<table class="formtable">
-						<tr class="formheaderrow">
-							<td class="formcolumnheader"></td>
-							<td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.ParameterName")%></nobr></td>
-							<td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.ParameterValue")%></nobr></td>
-						</tr>
-<%
-		String[] paramNames = new String[forcedMetadata.size()];
-		int k = 0;
-		int q = 0;
-		for (String paramName : forcedMetadata.keySet())
-		{
-			paramNames[q++] = paramName;
-		}
-		java.util.Arrays.sort(paramNames);
-		for (String paramName : paramNames)
-		{
-			Set<String> values = forcedMetadata.get(paramName);
-			String[] paramValues = new String[values.size()];
-			q = 0;
-			for (String paramValue : values)
-			{
-				paramValues[q++] = paramValue;
-			}
-			java.util.Arrays.sort(paramValues);
-			for (String paramValue : paramValues)
-			{
-				String prefix = "forcedmetadata_"+k;
-%>
-						<tr class='<%=((k % 2)==0)?"evenformrow":"oddformrow"%>'>
-							<td class="formcolumncell">
-								<a name="<%=prefix+"_tag"%>"/>
-								<input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Delete")%>" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Deleteforcedmetadatanumber")+Integer.toString(k)%>" onclick='<%="javascript:DeleteForcedMetadata("+Integer.toString(k)+");"%>'/>
-								<input type="hidden" name="<%=prefix+"_op"%>" value="Continue"/>
-								<input type="hidden" name="<%=prefix+"_name"%>" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(paramName)%>"/>
-								<input type="hidden" name="<%=prefix+"_value"%>" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(paramValue)%>"/>
-							</td>
-							<td class="formcolumncell">
-								<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(paramName)%></nobr>
-							</td>
-							<td class="formcolumncell">
-								<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(paramValue)%></nobr>
-							</td>
-						</tr>
-<%
-				k++;
-			}
-		}
-		if (k == 0)
-		{
-%>
-						<tr class="formrow"><td colspan="3" class="formcolumnmessage"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.NoForcedMetadataSpecified")%></nobr></td></tr>
-<%
-		}
-%>
-						<tr class="formrow"><td colspan="3" class="formseparator"><hr/></td></tr>
-						<tr class="formrow">
-							<td class="formcolumncell">
-								<a name="forcedmetadata_tag"/>
-								<input type="hidden" name="forcedmetadata_op" value="Continue"/>
-								<input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Add")%>" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Addforcedmetadata")%>" onclick="javascript:AddForcedMetadata();"/>
-								<input type="hidden" name="forcedmetadata_count" value="<%=k%>"/>
-							</td>
-							<td class="formcolumncell">
-								<input type="text" name="forcedmetadata_name" size="30" value=""/>
-							</td>
-							<td class="formcolumncell">
-								<input type="text" name="forcedmetadata_value" size="30" value=""/>
-							</td>
-						</tr>
-
-					</table>
-				</td>
-			</tr>
-		  </table>
-<%
-	}
-	else
-	{
-		int k = 0;
-		for (String paramName : forcedMetadata.keySet())
-		{
-			Set<String> values = forcedMetadata.get(paramName);
-			for (String paramValue : values)
-			{
-				String prefix = "forcedmetadata_"+k;
-%>
-		  <input type="hidden" name="<%=prefix+"_name"%>" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(paramName)%>"/>
-		  <input type="hidden" name="<%=prefix+"_value"%>" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(paramValue)%>"/>
-<%
-				k++;
-			}
-		}
-%>
-		  <input type="hidden" name="forcedmetadata_count" value="<%=k%>"/>
-<%
-	}
-	
 	// Hop Filters tab
 	if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopFilters")) && tabSequenceInt == -1)
 	{

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=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp Mon Aug 25 12:13:35 2014
@@ -1093,36 +1093,6 @@
 						job.addScheduleRecord(sr);
 					}
 
-					// Handle forced metadata
-					x = variableContext.getParameter("forcedmetadata_count");
-					if (x != null)
-					{
-						job.clearForcedMetadata();
-						int count = Integer.parseInt(x);
-						for (int k = 0; k < count; k++)
-						{
-							String prefix = "forcedmetadata_"+k;
-							x = variableContext.getParameter(prefix+"_op");
-							if (x == null || !x.equals("Delete"))
-							{
-								String paramName = variableContext.getParameter(prefix+"_name");
-								String paramValue = variableContext.getParameter(prefix+"_value");
-								if (paramValue == null)
-									paramValue = "";
-								job.addForcedMetadataValue(paramName,paramValue);
-							}
-						}
-						x = variableContext.getParameter("forcedmetadata_op");
-						if (x != null && x.equals("Add"))
-						{
-							String paramName = variableContext.getParameter("forcedmetadata_name");
-							String paramValue = variableContext.getParameter("forcedmetadata_value");
-							if (paramValue == null)
-								paramValue = "";
-							job.addForcedMetadataValue(paramName,paramValue);
-						}
-					}
-					
 					x = variableContext.getParameter("priority");
 					if (x != null)
 						job.setPriority(Integer.parseInt(x));

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=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp Mon Aug 25 12:13:35 2014
@@ -149,7 +149,6 @@
 		String[] relationshipTypes = RepositoryConnectorFactory.getRelationshipTypes(threadContext,connection.getClassName());
 		Map hopCountFilters = job.getHopCountFilters();
 		int hopcountMode = job.getHopcountMode();
-		Map<String,Set<String>> forcedMetadata = job.getForcedMetadata();
 		
 		//threadContext.save("OutputSpecification",job.getOutputSpecification());
 		//threadContext.save("OutputConnection",outputConnection);
@@ -583,57 +582,6 @@
 				j++;
 			}
 		}
-%>
-			<tr>
-				<td class="separator" colspan="4"><hr/></td>
-			</tr>
-<%
-		if (forcedMetadata.size() == 0)
-		{
-%>
-			<tr><td class="message" colspan="4"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoForcedMetadata")%></td></tr>
-<%
-		}
-		else
-		{
-%>
-			<tr>
-				<td class="separator" colspan="4"><hr/></td>
-			</tr>
-			<tr>
-				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ForcedMetadataColon")%></nobr></td>
-				<td class="value" colspan="3">
-<%
-			String[] paramNames = new String[forcedMetadata.size()];
-			int q = 0;
-			for (String paramName : forcedMetadata.keySet())
-			{
-				paramNames[q++] = paramName;
-			}
-			java.util.Arrays.sort(paramNames);
-			for (String paramName : paramNames)
-			{
-				Set<String> values = forcedMetadata.get(paramName);
-				String[] paramValues = new String[values.size()];
-				q = 0;
-				for (String paramValue : values)
-				{
-					paramValues[q++] = paramValue;
-				}
-				java.util.Arrays.sort(paramValues);
-				for (String paramValue : paramValues)
-				{
-					out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(paramName) + " = " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(paramValue));
-%>
-					<br/>
-<%
-				}
-			}
-%>
-				</td>
-			</tr>
-<%
-		}
 		
 		if (relationshipTypes != null && relationshipTypes.length > 0)
 		{

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java Mon Aug 25 12:13:35 2014
@@ -279,19 +279,4 @@ public interface IJobDescription
   /** Set the hopcount mode. */
   public void setHopcountMode(int mode);
 
-  // Forced metadata
-  
-  /** Get the forced metadata.
-  *@return the set as a map, keyed by metadata name, with value a set of strings.
-  */
-  public Map<String,Set<String>> getForcedMetadata();
-  
-  /** Clear forced metadata.
-  */
-  public void clearForcedMetadata();
-  
-  /** Add a forced metadata name/value pair.
-  */
-  public void addForcedMetadataValue(String name, String value);
-  
 }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java Mon Aug 25 12:13:35 2014
@@ -75,9 +75,6 @@ public class JobDescription implements I
   // Hopcount mode
   protected int hopcountMode = HOPCOUNT_ACCURATE;
 
-  // Forced metadata
-  protected Map<String,Set<String>> forcedMetadata = new HashMap<String,Set<String>>();
-  
   // Read-only mode
   protected boolean readOnly = false;
 
@@ -122,14 +119,6 @@ public class JobDescription implements I
       Long maxHops = (Long)hopCountFilters.get(linkType);
       rval.hopCountFilters.put(linkType,maxHops);
     }
-    for (String forcedParamName : forcedMetadata.keySet())
-    {
-      Set<String> values = forcedMetadata.get(forcedParamName);
-      for (String value : values)
-      {
-        rval.addForcedMetadataValue(forcedParamName,value);
-      }
-    }
     rval.readOnly = readOnly;
     return rval;
   }
@@ -613,39 +602,6 @@ public class JobDescription implements I
     hopcountMode = mode;
   }
 
-  // Forced metadata
-  
-  /** Get the forced metadata.
-  *@return the set as a map, keyed by metadata name, with value a set of strings.
-  */
-  @Override
-  public Map<String,Set<String>> getForcedMetadata()
-  {
-    return forcedMetadata;
-  }
-  
-  /** Clear forced metadata.
-  */
-  @Override
-  public void clearForcedMetadata()
-  {
-    forcedMetadata.clear();
-  }
-  
-  /** Add a forced metadata name/value pair.
-  */
-  @Override
-  public void addForcedMetadataValue(String name, String value)
-  {
-    Set<String> rval = forcedMetadata.get(name);
-    if (rval == null)
-    {
-      rval = new HashSet<String>();
-      forcedMetadata.put(name,rval);
-    }
-    rval.add(value);
-  }
-
   protected static class PipelineStage
   {
     protected int prerequisiteStage;

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=1620301&r1=1620300&r2=1620301&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 Mon Aug 25 12:13:35 2014
@@ -170,18 +170,7 @@ public class JobManager implements IJobM
       }
       
       // Write forced metadata information
-      Map<String,Set<String>> forcedMetadata = job.getForcedMetadata();
-      ManifoldCF.writeDword(os,forcedMetadata.size());
-      for (String key : forcedMetadata.keySet())
-      {
-        ManifoldCF.writeString(os,key);
-        Set<String> values = forcedMetadata.get(key);
-        ManifoldCF.writeDword(os,values.size());
-        for (String value : values)
-        {
-          ManifoldCF.writeString(os,value);
-        }
-      }
+      ManifoldCF.writeDword(os,0);
       
       // Write pipeline information
       ManifoldCF.writeDword(os,job.countPipelineStages());
@@ -287,7 +276,7 @@ public class JobManager implements IJobM
           for (int k = 0; k < valueCount; k++)
           {
             String value = ManifoldCF.readString(is);
-            job.addForcedMetadataValue(key,value);
+            // Discard it; we don't support this anymore
           }
         }
         

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=1620301&r1=1620300&r2=1620301&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 Mon Aug 25 12:13:35 2014
@@ -344,7 +344,6 @@ public class Jobs extends org.apache.man
   protected final ICacheManager cacheManager;
   protected final ScheduleManager scheduleManager;
   protected final HopFilterManager hopFilterManager;
-  protected final ForcedParamManager forcedParamManager;
   protected final PipelineManager pipelineManager;
   
   protected final IOutputConnectionManager outputMgr;
@@ -363,7 +362,6 @@ public class Jobs extends org.apache.man
     this.threadContext = threadContext;
     scheduleManager = new ScheduleManager(threadContext,database);
     hopFilterManager = new HopFilterManager(threadContext,database);
-    forcedParamManager = new ForcedParamManager(threadContext,database);
     pipelineManager = new PipelineManager(threadContext,database);
     
     cacheManager = CacheManagerFactory.make(threadContext);
@@ -528,7 +526,6 @@ public class Jobs extends org.apache.man
       }
       scheduleManager.install(getTableName(),idField);
       hopFilterManager.install(getTableName(),idField);
-      forcedParamManager.install(getTableName(),idField);
 
       // Index management
       IndexDescription statusIndex = new IndexDescription(false,new String[]{statusField,idField,priorityField});
@@ -580,7 +577,6 @@ public class Jobs extends org.apache.man
     beginTransaction();
     try
     {
-      forcedParamManager.deinstall();
       hopFilterManager.deinstall();
       scheduleManager.deinstall();
       pipelineManager.deinstall();
@@ -869,7 +865,6 @@ public class Jobs extends org.apache.man
     {
       scheduleManager.deleteRows(id);
       hopFilterManager.deleteRows(id);
-      forcedParamManager.deleteRows(id);
       pipelineManager.deleteRows(id);
       ArrayList params = new ArrayList();
       String query = buildConjunctionClause(params,new ClauseDescription[]{
@@ -1004,9 +999,6 @@ public class Jobs extends org.apache.man
               if (isSame)
                 isSame = hopFilterManager.compareRows(id,jobDescription);
 
-              if (isSame)
-                isSame = forcedParamManager.compareRows(id,jobDescription);
-
               if (!isSame)
                 values.put(seedingVersionField,null);
 
@@ -1017,7 +1009,6 @@ public class Jobs extends org.apache.man
               pipelineManager.deleteRows(id);
               scheduleManager.deleteRows(id);
               hopFilterManager.deleteRows(id);
-              forcedParamManager.deleteRows(id);
             }
             else
             {
@@ -1037,8 +1028,6 @@ public class Jobs extends org.apache.man
             scheduleManager.writeRows(id,jobDescription);
             // Write hop filter rows
             hopFilterManager.writeRows(id,jobDescription);
-            // Write forced params
-            forcedParamManager.writeRows(id,jobDescription);
             
             cacheManager.invalidateKeys(ch);
             break;
@@ -3594,7 +3583,6 @@ public class Jobs extends org.apache.man
       pipelineManager.getRows(returnValues,idList,params);
       scheduleManager.getRows(returnValues,idList,params);
       hopFilterManager.getRows(returnValues,idList,params);
-      forcedParamManager.getRows(returnValues,idList,params);
     }
     catch (NumberFormatException e)
     {

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=1620301&r1=1620300&r2=1620301&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 Mon Aug 25 12:13:35 2014
@@ -3869,7 +3869,6 @@ public class ManifoldCF extends org.apac
   protected static final String JOBNODE_HOUROFDAY = "hourofday";
   protected static final String JOBNODE_MINUTESOFHOUR = "minutesofhour";
   protected static final String JOBNODE_ENUMVALUE = "value";
-  protected static final String JOBNODE_FORCEDPARAM = "forcedparam";
   protected static final String JOBNODE_PARAMNAME = "paramname";
   protected static final String JOBNODE_PARAMVALUE = "paramvalue";
   protected static final String JOBNODE_PIPELINESTAGE = "pipelinestage";
@@ -4013,27 +4012,6 @@ public class ManifoldCF extends org.apac
           throw new ManifoldCFException("Missing required field: '"+JOBNODE_COUNT+"'");
         jobDescription.addHopCountFilter(linkType,new Long(hopCount));
       }
-      else if (childType.equals(JOBNODE_FORCEDPARAM))
-      {
-        // Read the forced parameter values
-        String paramName = null;
-        String paramValue = null;
-        for (int q = 0; q < child.getChildCount(); q++)
-        {
-          ConfigurationNode cn = child.findChild(q);
-          if (cn.getType().equals(JOBNODE_PARAMNAME))
-            paramName = cn.getValue();
-          else if (cn.getType().equals(JOBNODE_PARAMVALUE))
-            paramValue = cn.getValue();
-          else
-            throw new ManifoldCFException("Found an unexpected node type: '"+cn.getType()+"'");
-        }
-        if (paramName == null)
-          throw new ManifoldCFException("Missing required field: '"+JOBNODE_PARAMNAME+"'");
-        if (paramValue == null)
-          throw new ManifoldCFException("Missing required field: '"+JOBNODE_PARAMVALUE+"'");
-        jobDescription.addForcedMetadataValue(paramName,paramValue);
-      }
       else if (childType.equals(JOBNODE_SCHEDULE))
       {
         // Create a schedule record.
@@ -4300,25 +4278,6 @@ public class ManifoldCF extends org.apac
       jobNode.addChild(jobNode.getChildCount(),child);
     }
     
-    // Forced metadata records
-    Map<String,Set<String>> forcedMetadata = job.getForcedMetadata();
-    for (String paramName : forcedMetadata.keySet())
-    {
-      Set<String> values = forcedMetadata.get(paramName);
-      for (String paramValue : values)
-      {
-        child = new ConfigurationNode(JOBNODE_FORCEDPARAM);
-        ConfigurationNode cn;
-        cn = new ConfigurationNode(JOBNODE_PARAMNAME);
-        cn.setValue(paramName);
-        child.addChild(child.getChildCount(),cn);
-        cn = new ConfigurationNode(JOBNODE_PARAMVALUE);
-        cn.setValue(paramValue);
-        child.addChild(child.getChildCount(),cn);
-        jobNode.addChild(jobNode.getChildCount(),child);
-      }
-    }
-    
     // Schedule records
     for (int j = 0; j < job.getScheduleRecordCount(); j++)
     {

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecificationWithVersions.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecificationWithVersions.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecificationWithVersions.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecificationWithVersions.java Mon Aug 25 12:13:35 2014
@@ -69,19 +69,6 @@ public class PipelineSpecificationWithVe
     return status.getDocumentVersion();
   }
     
-  /** For a given output index, return a parameter version string.
-  *@param index is the output index.
-  *@return the parameter version string.
-  */
-  @Override
-  public String getOutputParameterVersionString(int index)
-  {
-    DocumentIngestStatus status = getStatus(index);
-    if (status == null)
-      return null;
-    return status.getParameterVersion();
-  }
-
 
   /** For a given output index, return a transformation version string.
   *@param index is the output index.

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java Mon Aug 25 12:13:35 2014
@@ -143,8 +143,6 @@ public class WorkerThread extends Thread
             // we interact with Incremental Ingester.
             IPipelineSpecificationBasic pipelineSpecificationBasic = new PipelineSpecificationBasic(job);
             String lastIndexedOutputConnectionName = ingester.getLastIndexedOutputConnectionName(pipelineSpecificationBasic);
-            // Compute a parameter version string for all documents in this job
-            String newParameterVersion = packParameters(job.getForcedMetadata());
 
             // Universal job data we'll need later
             String connectionName = job.getConnectionName();
@@ -362,12 +360,10 @@ public class WorkerThread extends Thread
                       previousDocuments,
                       currentTime,
                       job.getExpiration(),
-                      job.getForcedMetadata(),
                       job.getInterval(),
                       job.getMaxInterval(),
                       job.getHopcountMode(),
-                      connection,connector,connMgr,legalLinkTypes,ingestLogger,
-                      newParameterVersion);
+                      connection,connector,connMgr,legalLinkTypes,ingestLogger);
                     try
                     {
                       if (Logging.threads.isDebugEnabled())
@@ -1049,60 +1045,6 @@ public class WorkerThread extends Thread
     }
   }
 
-  /** Another stuffer for packing lists of variable length */
-  protected static void packList(StringBuilder output, String[] values, char delimiter)
-  {
-    pack(output,Integer.toString(values.length),delimiter);
-    int i = 0;
-    while (i < values.length)
-    {
-      pack(output,values[i++],delimiter);
-    }
-  }
-
-  protected static String packParameters(Map<String,Set<String>> forcedParameters)
-  {
-    StringBuilder sb = new StringBuilder();
-    String[] paramNames = new String[forcedParameters.size()];
-    int i = 0;
-    for (String paramName : forcedParameters.keySet())
-    {
-      paramNames[i++] = paramName;
-    }
-    java.util.Arrays.sort(paramNames);
-    for (String paramName : paramNames)
-    {
-      Set<String> values = forcedParameters.get(paramName);
-      String[] paramValues = new String[values.size()];
-      i = 0;
-      for (String paramValue : values)
-      {
-        paramValues[i++] = paramValue;
-      }
-      java.util.Arrays.sort(paramValues);
-      for (String paramValue : paramValues)
-      {
-        pack(sb,paramName,'+');
-        pack(sb,paramValue,'+');
-      }
-    }
-    return sb.toString();
-  }
-  
-  protected static void pack(StringBuilder sb, String value, char delim)
-  {
-    for (int i = 0; i < value.length(); i++)
-    {
-      char x = value.charAt(i);
-      if (x == delim || x == '\\')
-      {
-        sb.append('\\');
-      }
-      sb.append(x);
-    }
-    sb.append(delim);
-  }
-
   /** The maximum number of adds that happen in a single transaction */
   protected static final int MAX_ADDS_IN_TRANSACTION = 20;
 
@@ -1123,7 +1065,6 @@ public class WorkerThread extends Thread
     protected final Map<String,QueuedDocument> previousDocuments;
     protected final long currentTime;
     protected final Long expireInterval;
-    protected final Map<String,Set<String>> forcedMetadata;
     protected final Long recrawlInterval;
     protected final Long maxInterval;
     protected final int hopcountMode;
@@ -1133,7 +1074,6 @@ public class WorkerThread extends Thread
     protected final String[] legalLinkTypes;
     protected final OutputActivity ingestLogger;
     protected final IReprioritizationTracker rt;
-    protected final String parameterVersion;
     
     // We submit references in bulk, because that's way more efficient.
     protected final Map<DocumentReference,DocumentReference> referenceList = new HashMap<DocumentReference,DocumentReference>();
@@ -1175,13 +1115,11 @@ public class WorkerThread extends Thread
       Map<String,QueuedDocument> previousDocuments,
       long currentTime,
       Long expireInterval,
-      Map<String,Set<String>> forcedMetadata,
       Long recrawlInterval,
       Long maxInterval,
       int hopcountMode,
       IRepositoryConnection connection, IRepositoryConnector connector,
-      IRepositoryConnectionManager connMgr, String[] legalLinkTypes, OutputActivity ingestLogger,
-      String parameterVersion)
+      IRepositoryConnectionManager connMgr, String[] legalLinkTypes, OutputActivity ingestLogger)
     {
       this.jobID = jobID;
       this.processID = processID;
@@ -1194,7 +1132,6 @@ public class WorkerThread extends Thread
       this.previousDocuments = previousDocuments;
       this.currentTime = currentTime;
       this.expireInterval = expireInterval;
-      this.forcedMetadata = forcedMetadata;
       this.recrawlInterval = recrawlInterval;
       this.maxInterval = maxInterval;
       this.hopcountMode = hopcountMode;
@@ -1203,7 +1140,6 @@ public class WorkerThread extends Thread
       this.connMgr = connMgr;
       this.legalLinkTypes = legalLinkTypes;
       this.ingestLogger = ingestLogger;
-      this.parameterVersion = parameterVersion;
     }
 
     /** Clean up any dangling information, before abandoning this process activity object */
@@ -1281,7 +1217,7 @@ public class WorkerThread extends Thread
       String documentIdentifierHash = ManifoldCF.hash(documentIdentifier);
       String componentIdentifierHash = computeComponentIDHash(componentIdentifier);
       IPipelineSpecificationWithVersions spec = computePipelineSpecification(documentIdentifierHash,componentIdentifierHash,documentIdentifier);
-      return ingester.checkFetchDocument(spec,newVersionString,parameterVersion,connection.getACLAuthority());
+      return ingester.checkFetchDocument(spec,newVersionString,connection.getACLAuthority());
     }
 
     /** Add a document description to the current job's queue.
@@ -1578,23 +1514,6 @@ public class WorkerThread extends Thread
       String componentIdentifierHash = computeComponentIDHash(componentIdentifier);
       checkMultipleDispositions(documentIdentifier,componentIdentifier,componentIdentifierHash);
 
-      // First, we need to add into the metadata the stuff from the job description.
-      if (data != null)
-      {
-        // Modify the repository document with forced parameters.
-        for (String paramName : forcedMetadata.keySet())
-        {
-          Set<String> values = forcedMetadata.get(paramName);
-          String[] paramValues = new String[values.size()];
-          int j = 0;
-          for (String value : values)
-          {
-            paramValues[j++] = value;
-          }
-          data.addField(paramName,paramValues);
-        }
-      }
-        
       // This method currently signals whether the document is accepted or rejected permanently.
       // Permanent rejection should involve leaving the document in the queue (since it probably
       // will be rediscovered), and noting its version (so that we don't try doing anything with it
@@ -1606,7 +1525,7 @@ public class WorkerThread extends Thread
       ingester.documentIngest(
         computePipelineSpecification(documentIdentifierHash,componentIdentifierHash,documentIdentifier),
         connectionName,documentIdentifierHash,componentIdentifierHash,
-        version,parameterVersion,
+        version,
         connection.getACLAuthority(),
         data,currentTime,
         documentURI,
@@ -1649,7 +1568,7 @@ public class WorkerThread extends Thread
       ingester.documentNoData(
         computePipelineSpecification(documentIdentifierHash,componentIdentifierHash,documentIdentifier),
         connectionName,documentIdentifierHash,componentIdentifierHash,
-        version,parameterVersion,
+        version,
         connection.getACLAuthority(),
         currentTime,
         ingestLogger);

Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1620301&r1=1620300&r2=1620301&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml Mon Aug 25 12:13:35 2014
@@ -506,17 +506,6 @@
                 <p>The rest of the job tabs depend on the types of the connections you selected.  Please refer to the section of the manual
                        describing the appropriate connection types corresponding to your chosen repository and output connections for a description of the job tabs that will appear for
                        those connections.</p>
-                <p>All jobs also have a "Forced Metadata" tab.  This allows you to specify metadata values that are specific to those documents indexed by the job, which can be
-                       very useful in categorizing documents within a search engine.  The "Forced Metadata" tab looks like this:</p>
-                <br/><br/>
-                <figure src="images/en_US/add-new-job-forced-metadata.PNG" alt="Add New Job, forced metadata tab" width="80%"/>
-                <br/><br/>
-                <p>Enter the name of the metadata parameter you want to include in the "Parameter name" column, and the value in the "Parameter value" column, and click the
-                      "Add" button.  For example:</p>
-                <br/><br/>
-                <figure src="images/en_US/add-new-job-forced-metadata-example.PNG" alt="Add New Job, forced metadata tab with example" width="80%"/>
-                <br/><br/>
-                <p>You may add multiple parameter values, or delete values you do not want by clicking the appropriate "Delete" button.</p>
                 
                 <p>After you save your job, a summary screen will be displayed that describes your job's specification.  This looks something like this (although the details will differ
                       somewhat based on what connections you chose):</p>

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=1620301&r1=1620300&r2=1620301&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 Mon Aug 25 12:13:35 2014
@@ -451,7 +451,6 @@
             <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>
             <tr><td>"schedule"</td><td>An array of schedule objects, describing when the job should be started and run</td></tr>
-            <tr><td>"forcedparam"</td><td>An array of forcedparam objects, describing what forced parameters should be set</td></tr>
             <tr><td>"pipelinestage"</td><td>An array of pipelinestage objects, describing what the transformation pipeline is</td></tr>
           </table>
           <p></p>
@@ -467,14 +466,6 @@
             <tr><td>"stage_specification"</td><td>The specification string for the pipeline stage</td></tr>
           </table>
           <p></p>
-          <p>Each forcedparam object has the following fields:</p>
-          <p></p>
-          <table>
-            <tr><th>Field</th><th>Meaning</th></tr>
-            <tr><td>"paramname"</td><td>The name of the parameter</td></tr>
-            <tr><td>"paramvalue"</td><td>The value of the parameter</td></tr>
-          </table>
-          <p></p>
           <p>Each hopcount object has the following fields:</p>
           <p></p>
           <table>



Mime
View raw message