Refactor

mccullen · Feb 1, 2021 · f441d36 · f441d36
1 parent f0d3179
commit f441d36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/icapa/cr/S3DelimiterReader.java b/src/main/java/icapa/cr/S3DelimiterReader.java
@@ -27,16 +27,14 @@ public class S3DelimiterReader extends AbstractDelimiterReader {
     static public final String PARAM_BUCKET = "Bucket";
     @ConfigurationParameter(
         name = PARAM_BUCKET,
-        defaultValue = "*",
-        mandatory = false
+        defaultValue = "*"
     )
     private String _bucket;
 
     static public final String PARAM_KEY = "Key";
     @ConfigurationParameter(
         name = PARAM_KEY,
-        defaultValue = "*",
-        mandatory = false
+        defaultValue = "*"
     )
     private String _key;
 

diff --git a/src/main/resources/teradata.piper b/src/main/resources/teradata.piper
@@ -1,6 +1,6 @@
 // Custom reader
-reader icapa.cr.JdbcReader SqlStatement="SELECT * FROM ICAPA.NLP_TBI_Note WHERE NLP_TBI_Note_Id >%3D 10935 ORDER BY NLP_TBI_Note_Id;" DocTextColName=NOTE DriverClassName="com.teradata.jdbc.TeraDriver" DocumentIdColumnName=NLP_TBI_Note_Id URL="jdbc:teradata://EDWP/CHARSET%3DUTF8,ENCRYPTDATA%3DON,TCP%3DKEEPALIVE,TMODE%3DANSI,LOGMECH%3DKRB5"
+reader icapa.cr.JdbcReader SqlStatement="SELECT NOTE, NLP_TBI_Note_Id FROM ICAPA.NLP_TBI_Note ORDER BY NLP_TBI_Note_Id;" DocTextColName=NOTE DriverClassName="com.teradata.jdbc.TeraDriver" DocumentIdColumnName=NLP_TBI_Note_Id URL="jdbc:teradata://EDWP/CHARSET%3DUTF8,ENCRYPTDATA%3DON,TCP%3DKEEPALIVE,TMODE%3DANSI,LOGMECH%3DKRB5"
 load ./resources/org/apache/ctakes/clinical/pipeline/DefaultFastPipeline.piper
-add icapa.cc.JdbcOntologyWriter BatchSize=0 Table="ICAPA.NLP_TBI_Annotation" KeepAll=false DocumentIdColAndDatatype="NLP_TBI_Note_Id INT" CreateTableSuffix="NLP_TBI_Annotation_Id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY, CONSTRAINT pk PRIMARY KEY (NLP_TBI_Annotation_Id)" DriverClassName="com.teradata.jdbc.TeraDriver" URL="jdbc:teradata://EDWP/CHARSET%3DUTF8,ENCRYPTDATA%3DON,TCP%3DKEEPALIVE,TMODE%3DANSI,LOGMECH%3DKRB5"
+add icapa.cc.JdbcOntologyWriter BatchSize=100 Table="ICAPA.NLP_TBI_Annotation" KeepAll=false DocumentIdColAndDatatype="NLP_TBI_Note_Id INT" CreateTableSuffix="NLP_TBI_Annotation_Id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY, CONSTRAINT pk PRIMARY KEY (NLP_TBI_Annotation_Id)" DriverClassName="com.teradata.jdbc.TeraDriver" URL="jdbc:teradata://EDWP/CHARSET%3DUTF8,ENCRYPTDATA%3DON,TCP%3DKEEPALIVE,TMODE%3DANSI,LOGMECH%3DKRB5"
 // RUN COMMAND: bin\runTeradata.bat -p U:/teradata.piper --key 08cde565-a6b0-4a50-8035-1a3d6ceb3835 -l org/apache/ctakes/dictionary/lookup/fast/icd.xml
 // net use U: \\mipfile\Analytics_Evaluation\share\apache-ctakes-4.0.0