You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2013/08/02 23:15:55 UTC
svn commit: r1509865 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main:
java/org/apache/uima/ducc/ java/org/apache/uima/ducc/common/uima/
resources/org/apache/uima/ducc/common/uima/
Author: eae
Date: Fri Aug 2 21:15:55 2013
New Revision: 1509865
URL: http://svn.apache.org/r1509865
Log:
UIMA-3110 modify workitem types and add SendToALL flow option
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem_Type.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobProcessFC.xml
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem.java?rev=1509865&r1=1509864&r2=1509865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem.java Fri Aug 2 21:15:55 2013
@@ -11,8 +11,8 @@ import org.apache.uima.jcas.cas.TOP;
/**
- * Updated by JCasGen Fri Jul 19 18:26:47 EDT 2013
- * XML source: /users1/eae/workspace-ducc/uima-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml
+ * Updated by JCasGen Fri Aug 02 09:06:21 EDT 2013
+ * XML source: /users1/eae/workspace-ducc/uima-ducc/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml
* @generated */
public class Workitem extends TOP {
/** @generated
@@ -52,39 +52,75 @@ public class Workitem extends TOP {
//*--------------*
- //* Feature: inputfile
+ //* Feature: sendToLast
- /** getter for inputfile - gets
+ /** getter for sendToLast - gets
* @generated */
- public String getInputfile() {
- if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_inputfile == null)
- jcasType.jcas.throwFeatMissing("inputfile", "org.apache.uima.ducc.Workitem");
- return jcasType.ll_cas.ll_getStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_inputfile);}
+ public boolean getSendToLast() {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_sendToLast == null)
+ jcasType.jcas.throwFeatMissing("sendToLast", "org.apache.uima.ducc.Workitem");
+ return jcasType.ll_cas.ll_getBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_sendToLast);}
- /** setter for inputfile - sets
+ /** setter for sendToLast - sets
* @generated */
- public void setInputfile(String v) {
- if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_inputfile == null)
- jcasType.jcas.throwFeatMissing("inputfile", "org.apache.uima.ducc.Workitem");
- jcasType.ll_cas.ll_setStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_inputfile, v);}
+ public void setSendToLast(boolean v) {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_sendToLast == null)
+ jcasType.jcas.throwFeatMissing("sendToLast", "org.apache.uima.ducc.Workitem");
+ jcasType.ll_cas.ll_setBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_sendToLast, v);}
//*--------------*
- //* Feature: outputfile
+ //* Feature: sendToAll
- /** getter for outputfile - gets
+ /** getter for sendToAll - gets
* @generated */
- public String getOutputfile() {
- if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_outputfile == null)
- jcasType.jcas.throwFeatMissing("outputfile", "org.apache.uima.ducc.Workitem");
- return jcasType.ll_cas.ll_getStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_outputfile);}
+ public boolean getSendToAll() {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_sendToAll == null)
+ jcasType.jcas.throwFeatMissing("sendToAll", "org.apache.uima.ducc.Workitem");
+ return jcasType.ll_cas.ll_getBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_sendToAll);}
- /** setter for outputfile - sets
+ /** setter for sendToAll - sets
* @generated */
- public void setOutputfile(String v) {
- if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_outputfile == null)
- jcasType.jcas.throwFeatMissing("outputfile", "org.apache.uima.ducc.Workitem");
- jcasType.ll_cas.ll_setStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_outputfile, v);}
+ public void setSendToAll(boolean v) {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_sendToAll == null)
+ jcasType.jcas.throwFeatMissing("sendToAll", "org.apache.uima.ducc.Workitem");
+ jcasType.ll_cas.ll_setBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_sendToAll, v);}
+
+
+ //*--------------*
+ //* Feature: inputspec
+
+ /** getter for inputspec - gets
+ * @generated */
+ public String getInputspec() {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_inputspec == null)
+ jcasType.jcas.throwFeatMissing("inputspec", "org.apache.uima.ducc.Workitem");
+ return jcasType.ll_cas.ll_getStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_inputspec);}
+
+ /** setter for inputspec - sets
+ * @generated */
+ public void setInputspec(String v) {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_inputspec == null)
+ jcasType.jcas.throwFeatMissing("inputspec", "org.apache.uima.ducc.Workitem");
+ jcasType.ll_cas.ll_setStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_inputspec, v);}
+
+
+ //*--------------*
+ //* Feature: outputspec
+
+ /** getter for outputspec - gets
+ * @generated */
+ public String getOutputspec() {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_outputspec == null)
+ jcasType.jcas.throwFeatMissing("outputspec", "org.apache.uima.ducc.Workitem");
+ return jcasType.ll_cas.ll_getStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_outputspec);}
+
+ /** setter for outputspec - sets
+ * @generated */
+ public void setOutputspec(String v) {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_outputspec == null)
+ jcasType.jcas.throwFeatMissing("outputspec", "org.apache.uima.ducc.Workitem");
+ jcasType.ll_cas.ll_setStringValue(addr, ((Workitem_Type)jcasType).casFeatCode_outputspec, v);}
//*--------------*
@@ -124,6 +160,24 @@ public class Workitem extends TOP {
//*--------------*
+ //* Feature: bytelength
+
+ /** getter for bytelength - gets Length in bytes of work item
+ * @generated */
+ public int getBytelength() {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_bytelength == null)
+ jcasType.jcas.throwFeatMissing("bytelength", "org.apache.uima.ducc.Workitem");
+ return jcasType.ll_cas.ll_getIntValue(addr, ((Workitem_Type)jcasType).casFeatCode_bytelength);}
+
+ /** setter for bytelength - sets Length in bytes of work item
+ * @generated */
+ public void setBytelength(int v) {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_bytelength == null)
+ jcasType.jcas.throwFeatMissing("bytelength", "org.apache.uima.ducc.Workitem");
+ jcasType.ll_cas.ll_setIntValue(addr, ((Workitem_Type)jcasType).casFeatCode_bytelength, v);}
+
+
+ //*--------------*
//* Feature: blocksize
/** getter for blocksize - gets Optional parameter to process input files in smaller chunks
@@ -160,21 +214,21 @@ public class Workitem extends TOP {
//*--------------*
- //* Feature: sendToCC
+ //* Feature: lastBlock
- /** getter for sendToCC - gets
+ /** getter for lastBlock - gets
* @generated */
- public boolean getSendToCC() {
- if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_sendToCC == null)
- jcasType.jcas.throwFeatMissing("sendToCC", "org.apache.uima.ducc.Workitem");
- return jcasType.ll_cas.ll_getBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_sendToCC);}
+ public boolean getLastBlock() {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_lastBlock == null)
+ jcasType.jcas.throwFeatMissing("lastBlock", "org.apache.uima.ducc.Workitem");
+ return jcasType.ll_cas.ll_getBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_lastBlock);}
- /** setter for sendToCC - sets
+ /** setter for lastBlock - sets
* @generated */
- public void setSendToCC(boolean v) {
- if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_sendToCC == null)
- jcasType.jcas.throwFeatMissing("sendToCC", "org.apache.uima.ducc.Workitem");
- jcasType.ll_cas.ll_setBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_sendToCC, v);}
+ public void setLastBlock(boolean v) {
+ if (Workitem_Type.featOkTst && ((Workitem_Type)jcasType).casFeat_lastBlock == null)
+ jcasType.jcas.throwFeatMissing("lastBlock", "org.apache.uima.ducc.Workitem");
+ jcasType.ll_cas.ll_setBooleanValue(addr, ((Workitem_Type)jcasType).casFeatCode_lastBlock, v);}
}
\ No newline at end of file
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem_Type.java?rev=1509865&r1=1509864&r2=1509865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem_Type.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/Workitem_Type.java Fri Aug 2 21:15:55 2013
@@ -14,7 +14,7 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.jcas.cas.TOP_Type;
/**
- * Updated by JCasGen Fri Jul 19 18:26:47 EDT 2013
+ * Updated by JCasGen Fri Aug 02 09:06:21 EDT 2013
* @generated */
public class Workitem_Type extends TOP_Type {
/** @generated */
@@ -42,38 +42,74 @@ public class Workitem_Type extends TOP_T
public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.ducc.Workitem");
/** @generated */
- final Feature casFeat_inputfile;
+ final Feature casFeat_sendToLast;
/** @generated */
- final int casFeatCode_inputfile;
+ final int casFeatCode_sendToLast;
/** @generated */
- public String getInputfile(int addr) {
- if (featOkTst && casFeat_inputfile == null)
- jcas.throwFeatMissing("inputfile", "org.apache.uima.ducc.Workitem");
- return ll_cas.ll_getStringValue(addr, casFeatCode_inputfile);
+ public boolean getSendToLast(int addr) {
+ if (featOkTst && casFeat_sendToLast == null)
+ jcas.throwFeatMissing("sendToLast", "org.apache.uima.ducc.Workitem");
+ return ll_cas.ll_getBooleanValue(addr, casFeatCode_sendToLast);
}
/** @generated */
- public void setInputfile(int addr, String v) {
- if (featOkTst && casFeat_inputfile == null)
- jcas.throwFeatMissing("inputfile", "org.apache.uima.ducc.Workitem");
- ll_cas.ll_setStringValue(addr, casFeatCode_inputfile, v);}
+ public void setSendToLast(int addr, boolean v) {
+ if (featOkTst && casFeat_sendToLast == null)
+ jcas.throwFeatMissing("sendToLast", "org.apache.uima.ducc.Workitem");
+ ll_cas.ll_setBooleanValue(addr, casFeatCode_sendToLast, v);}
/** @generated */
- final Feature casFeat_outputfile;
+ final Feature casFeat_sendToAll;
/** @generated */
- final int casFeatCode_outputfile;
+ final int casFeatCode_sendToAll;
/** @generated */
- public String getOutputfile(int addr) {
- if (featOkTst && casFeat_outputfile == null)
- jcas.throwFeatMissing("outputfile", "org.apache.uima.ducc.Workitem");
- return ll_cas.ll_getStringValue(addr, casFeatCode_outputfile);
+ public boolean getSendToAll(int addr) {
+ if (featOkTst && casFeat_sendToAll == null)
+ jcas.throwFeatMissing("sendToAll", "org.apache.uima.ducc.Workitem");
+ return ll_cas.ll_getBooleanValue(addr, casFeatCode_sendToAll);
}
/** @generated */
- public void setOutputfile(int addr, String v) {
- if (featOkTst && casFeat_outputfile == null)
- jcas.throwFeatMissing("outputfile", "org.apache.uima.ducc.Workitem");
- ll_cas.ll_setStringValue(addr, casFeatCode_outputfile, v);}
+ public void setSendToAll(int addr, boolean v) {
+ if (featOkTst && casFeat_sendToAll == null)
+ jcas.throwFeatMissing("sendToAll", "org.apache.uima.ducc.Workitem");
+ ll_cas.ll_setBooleanValue(addr, casFeatCode_sendToAll, v);}
+
+
+
+ /** @generated */
+ final Feature casFeat_inputspec;
+ /** @generated */
+ final int casFeatCode_inputspec;
+ /** @generated */
+ public String getInputspec(int addr) {
+ if (featOkTst && casFeat_inputspec == null)
+ jcas.throwFeatMissing("inputspec", "org.apache.uima.ducc.Workitem");
+ return ll_cas.ll_getStringValue(addr, casFeatCode_inputspec);
+ }
+ /** @generated */
+ public void setInputspec(int addr, String v) {
+ if (featOkTst && casFeat_inputspec == null)
+ jcas.throwFeatMissing("inputspec", "org.apache.uima.ducc.Workitem");
+ ll_cas.ll_setStringValue(addr, casFeatCode_inputspec, v);}
+
+
+
+ /** @generated */
+ final Feature casFeat_outputspec;
+ /** @generated */
+ final int casFeatCode_outputspec;
+ /** @generated */
+ public String getOutputspec(int addr) {
+ if (featOkTst && casFeat_outputspec == null)
+ jcas.throwFeatMissing("outputspec", "org.apache.uima.ducc.Workitem");
+ return ll_cas.ll_getStringValue(addr, casFeatCode_outputspec);
+ }
+ /** @generated */
+ public void setOutputspec(int addr, String v) {
+ if (featOkTst && casFeat_outputspec == null)
+ jcas.throwFeatMissing("outputspec", "org.apache.uima.ducc.Workitem");
+ ll_cas.ll_setStringValue(addr, casFeatCode_outputspec, v);}
@@ -114,6 +150,24 @@ public class Workitem_Type extends TOP_T
/** @generated */
+ final Feature casFeat_bytelength;
+ /** @generated */
+ final int casFeatCode_bytelength;
+ /** @generated */
+ public int getBytelength(int addr) {
+ if (featOkTst && casFeat_bytelength == null)
+ jcas.throwFeatMissing("bytelength", "org.apache.uima.ducc.Workitem");
+ return ll_cas.ll_getIntValue(addr, casFeatCode_bytelength);
+ }
+ /** @generated */
+ public void setBytelength(int addr, int v) {
+ if (featOkTst && casFeat_bytelength == null)
+ jcas.throwFeatMissing("bytelength", "org.apache.uima.ducc.Workitem");
+ ll_cas.ll_setIntValue(addr, casFeatCode_bytelength, v);}
+
+
+
+ /** @generated */
final Feature casFeat_blocksize;
/** @generated */
final int casFeatCode_blocksize;
@@ -150,20 +204,20 @@ public class Workitem_Type extends TOP_T
/** @generated */
- final Feature casFeat_sendToCC;
+ final Feature casFeat_lastBlock;
/** @generated */
- final int casFeatCode_sendToCC;
+ final int casFeatCode_lastBlock;
/** @generated */
- public boolean getSendToCC(int addr) {
- if (featOkTst && casFeat_sendToCC == null)
- jcas.throwFeatMissing("sendToCC", "org.apache.uima.ducc.Workitem");
- return ll_cas.ll_getBooleanValue(addr, casFeatCode_sendToCC);
+ public boolean getLastBlock(int addr) {
+ if (featOkTst && casFeat_lastBlock == null)
+ jcas.throwFeatMissing("lastBlock", "org.apache.uima.ducc.Workitem");
+ return ll_cas.ll_getBooleanValue(addr, casFeatCode_lastBlock);
}
/** @generated */
- public void setSendToCC(int addr, boolean v) {
- if (featOkTst && casFeat_sendToCC == null)
- jcas.throwFeatMissing("sendToCC", "org.apache.uima.ducc.Workitem");
- ll_cas.ll_setBooleanValue(addr, casFeatCode_sendToCC, v);}
+ public void setLastBlock(int addr, boolean v) {
+ if (featOkTst && casFeat_lastBlock == null)
+ jcas.throwFeatMissing("lastBlock", "org.apache.uima.ducc.Workitem");
+ ll_cas.ll_setBooleanValue(addr, casFeatCode_lastBlock, v);}
@@ -176,12 +230,20 @@ public class Workitem_Type extends TOP_T
casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
- casFeat_inputfile = jcas.getRequiredFeatureDE(casType, "inputfile", "uima.cas.String", featOkTst);
- casFeatCode_inputfile = (null == casFeat_inputfile) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_inputfile).getCode();
+ casFeat_sendToLast = jcas.getRequiredFeatureDE(casType, "sendToLast", "uima.cas.Boolean", featOkTst);
+ casFeatCode_sendToLast = (null == casFeat_sendToLast) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_sendToLast).getCode();
+
+
+ casFeat_sendToAll = jcas.getRequiredFeatureDE(casType, "sendToAll", "uima.cas.Boolean", featOkTst);
+ casFeatCode_sendToAll = (null == casFeat_sendToAll) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_sendToAll).getCode();
- casFeat_outputfile = jcas.getRequiredFeatureDE(casType, "outputfile", "uima.cas.String", featOkTst);
- casFeatCode_outputfile = (null == casFeat_outputfile) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_outputfile).getCode();
+ casFeat_inputspec = jcas.getRequiredFeatureDE(casType, "inputspec", "uima.cas.String", featOkTst);
+ casFeatCode_inputspec = (null == casFeat_inputspec) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_inputspec).getCode();
+
+
+ casFeat_outputspec = jcas.getRequiredFeatureDE(casType, "outputspec", "uima.cas.String", featOkTst);
+ casFeatCode_outputspec = (null == casFeat_outputspec) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_outputspec).getCode();
casFeat_encoding = jcas.getRequiredFeatureDE(casType, "encoding", "uima.cas.String", featOkTst);
@@ -192,16 +254,20 @@ public class Workitem_Type extends TOP_T
casFeatCode_language = (null == casFeat_language) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_language).getCode();
- casFeat_blocksize = jcas.getRequiredFeatureDE(casType, "blocksize", "uima.cas.Integer", featOkTst);
- casFeatCode_blocksize = (null == casFeat_blocksize) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_blocksize).getCode();
+ casFeat_bytelength = jcas.getRequiredFeatureDE(casType, "bytelength", "uima.cas.Integer", featOkTst);
+ casFeatCode_bytelength = (null == casFeat_bytelength) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_bytelength).getCode();
casFeat_blockindex = jcas.getRequiredFeatureDE(casType, "blockindex", "uima.cas.Integer", featOkTst);
casFeatCode_blockindex = (null == casFeat_blockindex) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_blockindex).getCode();
- casFeat_sendToCC = jcas.getRequiredFeatureDE(casType, "sendToCC", "uima.cas.Boolean", featOkTst);
- casFeatCode_sendToCC = (null == casFeat_sendToCC) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_sendToCC).getCode();
+ casFeat_blocksize = jcas.getRequiredFeatureDE(casType, "blocksize", "uima.cas.Integer", featOkTst);
+ casFeatCode_blocksize = (null == casFeat_blocksize) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_blocksize).getCode();
+
+
+ casFeat_lastBlock = jcas.getRequiredFeatureDE(casType, "lastBlock", "uima.cas.Boolean", featOkTst);
+ casFeatCode_lastBlock = (null == casFeat_lastBlock) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_lastBlock).getCode();
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java?rev=1509865&r1=1509864&r2=1509865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java Fri Aug 2 21:15:55 2013
@@ -128,10 +128,6 @@ public class DuccJobProcessFC extends JC
@Override
public Step next() throws AnalysisEngineProcessException {
- if (currentStep >= mSequence.size()) {
- return new FinalStep(); // this CAS is cooked
- }
-
// If this is a work item CAS in a pipeline with an initial CM that has just been
// to the CM then check if it should be sent to the last step, e.g. the CC.
if (mStartsWithCasMultiplier && !internallyCreatedCas && currentStep == 1) {
@@ -142,13 +138,20 @@ public class DuccJobProcessFC extends JC
if (fsIter.hasNext()) {
throw new IllegalStateException("More than one instance of Workitem type");
}
- if (wi.getSendToCC()) {
- currentStep = mSequence.size();
- return new SimpleStep((String) mSequence.get(mSequence.size() - 1));
+ if (wi.getSendToAll()) {
+ // send WI-CAS to all delegates
+ }
+ else if (wi.getSendToLast()) {
+ // send to last delegate only
+ currentStep = mSequence.size() - 1;
}
}
- // Do not send to CC
- return new FinalStep();
+ // No Workitem FS in CAS, WI-CAS is at end of flow
+ else return new FinalStep();
+ }
+
+ if (currentStep >= mSequence.size()) {
+ return new FinalStep(); // this CAS is cooked
}
// Send to next component in pipeline
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml?rev=1509865&r1=1509864&r2=1509865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobFlowControlTS.xml Fri Aug 2 21:15:55 2013
@@ -1,9 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+<?xml version="1.0" encoding="UTF-8"?><typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+
+ <!--
+ ***************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ***************************************************************
+ -->
+
<name>Ducc Job Text Processing Control Types [String]</name>
- <description>Type for communication between CR, CM, FC and CC</description>
+ <description>Type for communication between CR and Job components CM, AE and CC</description>
<version>1.0</version>
- <vendor>IBM</vendor>
+ <vendor>Apache UIMA</vendor>
<types>
<typeDescription>
<name>org.apache.uima.ducc.Workitem</name>
@@ -11,12 +32,22 @@
<supertypeName>uima.cas.TOP</supertypeName>
<features>
<featureDescription>
- <name>inputfile</name>
+ <name>sendToLast</name>
+ <description/>
+ <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>sendToAll</name>
+ <description/>
+ <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>inputspec</name>
<description/>
<rangeTypeName>uima.cas.String</rangeTypeName>
</featureDescription>
<featureDescription>
- <name>outputfile</name>
+ <name>outputspec</name>
<description/>
<rangeTypeName>uima.cas.String</rangeTypeName>
</featureDescription>
@@ -31,21 +62,26 @@
<rangeTypeName>uima.cas.String</rangeTypeName>
</featureDescription>
<featureDescription>
- <name>blocksize</name>
- <description>Optional parameter to process input files in smaller chunks</description>
+ <name>bytelength</name>
+ <description>Length in bytes of work item</description>
<rangeTypeName>uima.cas.Integer</rangeTypeName>
</featureDescription>
<featureDescription>
<name>blockindex</name>
- <description>Optional parameter to specify block offset into input file to start processing</description>
+ <description>Optional parameter to specify block sequence number for input file</description>
<rangeTypeName>uima.cas.Integer</rangeTypeName>
</featureDescription>
<featureDescription>
- <name>sendToCC</name>
- <description/>
+ <name>blocksize</name>
+ <description>Optional parameter to specify block size</description>
+ <rangeTypeName>uima.cas.Integer</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>lastBlock</name>
+ <description>Optional parameter to specify this is last chunk for work item</description>
<rangeTypeName>uima.cas.Boolean</rangeTypeName>
</featureDescription>
</features>
</typeDescription>
</types>
-</typeSystemDescription>
+</typeSystemDescription>
\ No newline at end of file
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobProcessFC.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobProcessFC.xml?rev=1509865&r1=1509864&r2=1509865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobProcessFC.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/resources/org/apache/uima/ducc/common/uima/DuccJobProcessFC.xml Fri Aug 2 21:15:55 2013
@@ -24,7 +24,7 @@
<name>DUCC Job Flow Controller</name>
<description>Ducc FlowController for Job Processes assembled from user components. If WI-Cas is sent to initial CM, it is then dropped. All other parent CASes continue thru the flow.</description>
<version>1.0</version>
- <vendor>IBM</vendor>
+ <vendor>Apache UIMA</vendor>
<configurationParameters/>
<configurationParameterSettings/>
<typeSystemDescription>