svn commit: r1513937 - in /ctakes/trunk: ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/ ctakes-assertion/src/main/java/org/apache/ctakes/assertion/util/ ctakes-core/src/main/java/org/apache/ctakes/core/ae/

[ja...@apache.org]

Author: james-masanz
Date: Wed Aug 14 15:43:01 2013
New Revision: 1513937

URL: http://svn.apache.org/r1513937
Log:
move knowtator reader to assertion project where it is actually being used, so it can use assertion constants

Added:
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/MiPACQKnowtatorXMLReader.java
      - copied, changed from r1513920, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/MiPACQKnowtatorXMLReader.java
Removed:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/MiPACQKnowtatorXMLReader.java
Modified:
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/util/AssertionConst.java

Copied: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/MiPACQKnowtatorXMLReader.java (from r1513920, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/MiPACQKnowtatorXMLReader.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/MiPACQKnowtatorXMLReader.java?p2=ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/MiPACQKnowtatorXMLReader.java&p1=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/MiPACQKnowtatorXMLReader.java&r1=1513920&r2=1513937&rev=1513937&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/MiPACQKnowtatorXMLReader.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/MiPACQKnowtatorXMLReader.java Wed Aug 14 15:43:01 2013
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.assertion.util.AssertionConst;
 import org.apache.ctakes.core.knowtator.KnowtatorAnnotation;
 import org.apache.ctakes.core.knowtator.KnowtatorXMLParser;
 import org.apache.ctakes.core.util.CtakesFileNamer;
@@ -1386,7 +1387,7 @@ public class MiPACQKnowtatorXMLReader ex
 		  Exception e = new RuntimeException("Going to continue with default values");
 		  e.printStackTrace();
 		  dirs = new String[1];
-		  dirs[0] = "/usr/data/MiPACQ/copies-of-just-clinical-knowtator-xml-and-text/";
+		  dirs[0] = AssertionConst.MiPACQ_CORPUS;
 	  }
 
 	  AnalysisEngine mipacqReader = AnalysisEngineFactory.createPrimitive(MiPACQKnowtatorXMLReader.class);

Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/util/AssertionConst.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/util/AssertionConst.java?rev=1513937&r1=1513936&r2=1513937&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/util/AssertionConst.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/util/AssertionConst.java Wed Aug 14 15:43:01 2013
@@ -31,6 +31,9 @@ public class AssertionConst {
 	// expects subdirectories: ast, txt
 	public static final String I2B2_2010_TEST_CORPUS = DATA_DIR + "gold_standard/i2b2Challenge2010/Data/Test/reports/";
 
+	// expects subdirectories called exported-xml and text
+	public static final String MiPACQ_CORPUS = DATA_DIR + "gold_standard/copies-of-just-clinical-knowtator-xml-and-text/";
+
 	// Just plaintext files, which will be run through cTAKES, to generate XMI - attributes will then be judged
 	// This in input for cTAKES; the output (evalOutputDir) can then be the input of the judge step.
 	public static final String CORPUS_WO_GOLD_STD_TO_RUN_THROUGH_CTAKES = DATA_DIR + "ActiveLearning/plaintext";