svn commit: r1884721 - in /ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest: service/CuiResponse.java util/JCasParser.java

[tmill]

Author: tmill
Date: Tue Dec 22 20:42:17 2020
New Revision: 1884721

URL: http://svn.apache.org/viewvc?rev=1884721&view=rev
Log:
Add in more semantic types that users probably want returned from rest server, 
especially when using customized dictionaries.

Modified:
    
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/service/CuiResponse.java
    
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/util/JCasParser.java

Modified: 
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/service/CuiResponse.java
URL: 
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/service/CuiResponse.java?rev=1884721&r1=1884720&r2=1884721&view=diff
==============================================================================
--- 
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/service/CuiResponse.java
 (original)
+++ 
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/service/CuiResponse.java
 Tue Dec 22 20:42:17 2020
@@ -53,7 +53,7 @@ public class CuiResponse {
                     Map<String, String> atts = new HashMap<>();
                     atts.put("codingScheme", concept.getCodingScheme());
                     atts.put("cui", concept.getCui());
-                    atts.put("code", concept.getCode());
+                    atts.put("code", concept.getCode() == null ? "n/a" : 
concept.getCode());
                     atts.put("tui", concept.getTui());
                     conceptAttributes.add(atts);
                 }

Modified: 
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/util/JCasParser.java
URL: 
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/util/JCasParser.java?rev=1884721&r1=1884720&r2=1884721&view=diff
==============================================================================
--- 
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/util/JCasParser.java
 (original)
+++ 
ctakes/trunk/ctakes-web-rest/src/main/java/org/apache/ctakes/rest/util/JCasParser.java
 Tue Dec 22 20:42:17 2020
@@ -24,9 +24,11 @@ import org.apache.ctakes.typesystem.type
 import org.apache.uima.fit.util.JCasUtil;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.log4j.Logger;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -51,6 +53,9 @@ final public class JCasParser {
             ProcedureMention.class,
             AnatomicalSiteMention.class,
             MedicationMention.class,
+            EventMention.class,
+            EntityMention.class,
+            IdentifiedAnnotation.class,
 
             // Temporal types:
             TimeMention.class,