You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ma...@apache.org on 2013/01/25 19:38:44 UTC
svn commit: r1438641 - in
/incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima:
RunZoner.java ZoneAnnotator.java
Author: mattcoarr
Date: Fri Jan 25 18:38:44 2013
New Revision: 1438641
URL: http://svn.apache.org/viewvc?rev=1438641&view=rev
Log:
better getting of zoner regex configuration files from the classpath
Modified:
incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/RunZoner.java
incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/ZoneAnnotator.java
Modified: incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/RunZoner.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/RunZoner.java?rev=1438641&r1=1438640&r2=1438641&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/RunZoner.java (original)
+++ incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/RunZoner.java Fri Jan 25 18:38:44 2013
@@ -92,8 +92,10 @@ public class RunZoner
AnalysisEngineFactory.createPrimitiveDescription(DocumentIdPrinterAnalysisEngine.class);
builder.add(documentIdPrinter);
- URI generalSectionRegexFileUri =
- this.getClass().getClassLoader().getResource("org/mitre/medfacts/zoner/section_regex.xml").toURI();
+ String generalSectionRegexFileUri =
+ "org/mitre/medfacts/zoner/section_regex.xml";
+ //URI generalSectionRegexFileUri =
+ // this.getClass().getClassLoader().getResource("org/mitre/medfacts/zoner/section_regex.xml").toURI();
// ExternalResourceDescription generalSectionRegexDescription = ExternalResourceFactory.createExternalResourceDescription(
// SectionRegexConfigurationResource.class, new File(generalSectionRegexFileUri));
AnalysisEngineDescription zonerAnnotator =
@@ -103,8 +105,10 @@ public class RunZoner
);
builder.add(zonerAnnotator);
- URI mayoSectionRegexFileUri =
- this.getClass().getClassLoader().getResource("org/mitre/medfacts/zoner/mayo_sections.xml").toURI();
+ String mayoSectionRegexFileUri =
+ "org/mitre/medfacts/zoner/mayo_sections.xml";
+// URI mayoSectionRegexFileUri =
+// this.getClass().getClassLoader().getResource("org/mitre/medfacts/zoner/mayo_sections.xml").toURI();
// ExternalResourceDescription mayoSectionRegexDescription = ExternalResourceFactory.createExternalResourceDescription(
// SectionRegexConfigurationResource.class, new File(mayoSectionRegexFileUri));
AnalysisEngineDescription mayoZonerAnnotator =
Modified: incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/ZoneAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/ZoneAnnotator.java?rev=1438641&r1=1438640&r2=1438641&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/ZoneAnnotator.java (original)
+++ incubator/ctakes/trunk/ctakes-assertion-zoner/src/main/java/org/mitre/medfacts/uima/ZoneAnnotator.java Fri Jan 25 18:38:44 2013
@@ -2,8 +2,11 @@ package org.mitre.medfacts.uima;
import java.io.IOException;
import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.Iterator;
import java.util.List;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.ctakes.assertion.zoner.types.Heading;
@@ -47,7 +50,7 @@ public class ZoneAnnotator extends JCasA
name = PARAM_SECTION_REGEX_FILE_URI,
description = "xml configuration file with zone regular expression values",
mandatory = true)
- protected URI sectionRegexFileUri;
+ protected String sectionRegexFileUriString;
protected final Logger logger = Logger.getLogger(ZoneAnnotator.class.getName());
@@ -74,8 +77,19 @@ public class ZoneAnnotator extends JCasA
public void process(JCas jcas) throws AnalysisEngineProcessException {
// ZonerCliSimplified zonerCli =
// new ZonerCliSimplified(sectionRegexFileUri);
- ZonerCli zonerCli =
- new ZonerCli(sectionRegexFileUri);
+ URL sectionRegexFileInClasspathUrl =
+ getClass().getClassLoader().getResource(sectionRegexFileUriString);
+ URI sectionRegexFileInClasspathUri;
+ try
+ {
+ sectionRegexFileInClasspathUri = sectionRegexFileInClasspathUrl.toURI();
+ } catch (URISyntaxException e1)
+ {
+ logger.log(Level.SEVERE, String.format("section regex file not found [%s]", sectionRegexFileUriString), e1);
+ throw new AnalysisEngineProcessException(e1);
+ }
+ ZonerCli zonerCli =
+ new ZonerCli(sectionRegexFileInClasspathUri);
zonerCli.setEntireContents(jcas.getDocumentText());
// initialize converter once contents are set