You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2022/12/20 20:38:50 UTC
[ctakes] branch main updated: CTAKES-532 CTAKES-531
This is an automated email from the ASF dual-hosted git repository.
seanfinan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ctakes.git
The following commit(s) were added to refs/heads/main by this push:
new 4b56534 CTAKES-532 CTAKES-531
4b56534 is described below
commit 4b56534ba361a9c5957e913950223ca6bae4b1d0
Author: Sean Finan <se...@childrens.harvard.edu>
AuthorDate: Tue Dec 20 15:38:35 2022 -0500
CTAKES-532
CTAKES-531
---
.../ctakes/assertion/stub/SingleDocumentProcessor.java | 3 +++
.../org/apache/ctakes/core/cc/html/HtmlTextWriter.java | 15 ++++++++++-----
.../apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java | 15 ++++++++++-----
.../org/apache/ctakes/gui/dictionary/util/FileUtil.java | 2 +-
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/stub/SingleDocumentProcessor.java b/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/stub/SingleDocumentProcessor.java
index 1f01017..34ba7e5 100644
--- a/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/stub/SingleDocumentProcessor.java
+++ b/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/stub/SingleDocumentProcessor.java
@@ -21,6 +21,7 @@ public class SingleDocumentProcessor {
public Object addConcept(ApiConcept ac) {
// TODO Auto-generated method stub
+ LOGGER.warn("This class cannot be used until CTAKES-76 is implemented.");
return null;
}
@@ -46,6 +47,7 @@ public class SingleDocumentProcessor {
public Map<Integer, String> getAssertionTypeMap() {
// TODO Auto-generated method stub
+ LOGGER.warn("This class cannot be used until CTAKES-76 is implemented.");
return null;
}
@@ -74,6 +76,7 @@ public class SingleDocumentProcessor {
public String[][] getTokenArrays() {
// TODO Auto-generated method stub
+ LOGGER.warn("This class cannot be used until CTAKES-76 is implemented.");
return null;
}
diff --git a/ctakes-core/src/main/java/org/apache/ctakes/core/cc/html/HtmlTextWriter.java b/ctakes-core/src/main/java/org/apache/ctakes/core/cc/html/HtmlTextWriter.java
index 81a6a02..9e0f628 100644
--- a/ctakes-core/src/main/java/org/apache/ctakes/core/cc/html/HtmlTextWriter.java
+++ b/ctakes-core/src/main/java/org/apache/ctakes/core/cc/html/HtmlTextWriter.java
@@ -820,11 +820,16 @@ final public class HtmlTextWriter extends AbstractJCasFileWriter {
if ( text == null || text.isEmpty() ) {
return "";
}
- String safeText = text.replaceAll( "'", "'" );
- safeText = safeText.replaceAll( "\"", """ );
- safeText = safeText.replaceAll( "@", "&" );
- safeText = safeText.replaceAll( "<", "<" );
- safeText = safeText.replaceAll( ">", ">" );
+// String safeText = text.replaceAll( "'", "'" );
+// safeText = safeText.replaceAll( "\"", """ );
+// safeText = safeText.replaceAll( "@", "&" );
+// safeText = safeText.replaceAll( "<", "<" );
+// safeText = safeText.replaceAll( ">", ">" );
+ String safeText = text.replace( "'", "'" );
+ safeText = safeText.replace( "\"", """ );
+ safeText = safeText.replace( "@", "&" );
+ safeText = safeText.replace( "<", "<" );
+ safeText = safeText.replace( ">", ">" );
return safeText;
}
diff --git a/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java b/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
index 089af6e..39c92af 100644
--- a/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
+++ b/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
@@ -775,11 +775,16 @@ final public class HtmlTextWriter extends AbstractJCasFileWriter {
if ( text == null || text.isEmpty() ) {
return "";
}
- String safeText = text.replaceAll( "'", "'" );
- safeText = safeText.replaceAll( "\"", """ );
- safeText = safeText.replaceAll( "@", "&" );
- safeText = safeText.replaceAll( "<", "<" );
- safeText = safeText.replaceAll( ">", ">" );
+// String safeText = text.replaceAll( "'", "'" );
+// safeText = safeText.replaceAll( "\"", """ );
+// safeText = safeText.replaceAll( "@", "&" );
+// safeText = safeText.replaceAll( "<", "<" );
+// safeText = safeText.replaceAll( ">", ">" );
+ String safeText = text.replace( "'", "'" );
+ safeText = safeText.replace( "\"", """ );
+ safeText = safeText.replace( "@", "&" );
+ safeText = safeText.replace( "<", "<" );
+ safeText = safeText.replace( ">", ">" );
return safeText;
}
diff --git a/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/FileUtil.java b/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/FileUtil.java
index fdf5d75..17db39d 100644
--- a/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/FileUtil.java
+++ b/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/FileUtil.java
@@ -24,7 +24,7 @@ final public class FileUtil {
if ( dirPath == null || dirPath.isEmpty() ) {
return parseDirText( "." );
} else if ( dirPath.startsWith( "~" ) ) {
- return parseDirText( dirPath.replaceAll( "~", System.getProperty( "user.home" ) ) );
+ return parseDirText( dirPath.replace( "~", System.getProperty( "user.home" ) ) );
} else if ( dirPath.equals( "." ) ) {
final String userDir = System.getProperty( "user.dir" );
if ( userDir == null || userDir.isEmpty() ) {