[GF#33278] Page rendering breaks with UTF-8 characters that are not i…

…n ISO-8859-1.
NCIP · Apr 15, 2014 · 16370d8 · 16370d8
1 parent a94fd6e
commit 16370d8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/utils/DataUtils.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/utils/DataUtils.java
@@ -4737,4 +4737,24 @@ public static boolean isNullOrBlank(String value) {
 		return false;
 	}
 
+    public static String wrapWord(String line) {
+		if (line == null) return null;
+		if (line.indexOf(" ") != -1) return line;
+        Vector v = parseData(line, "_");
+        if (v.size() > 8) {
+			StringBuffer buf = new StringBuffer();
+			for (int i=0; i<4; i++) {
+				String t = (String) v.elementAt(i);
+				buf.append(t + "_");
+			}
+			buf.append(" ");
+			for (int i=4; i<v.size(); i++) {
+				String t = (String) v.elementAt(i);
+				buf.append(t + "_");
+			}
+			String s = buf.toString();
+			return s.substring(0, s.length()-1);
+		}
+        return line;
+    }
 }
diff --git a/software/ncimbrowser/web/css/styleSheet.css b/software/ncimbrowser/web/css/styleSheet.css
@@ -676,13 +676,14 @@ h3
  text-decoration: none;
 }
 
-
-
-
 .datatable_960
 {
  table-layout: fixed;
  width: 900px;
  word-wrap: break-word;
  font-size: 11px;
 }
+
+
+
+
diff --git a/software/ncimbrowser/web/pages/property_help_info.jsp b/software/ncimbrowser/web/pages/property_help_info.jsp
@@ -82,6 +82,8 @@ The NCI Metathesaurus (NCIm) includes the properties listed below:
                  if (t.compareTo(prev_t) != 0) {
        Vector w = DataUtils.parseData(t, "|");
        String abbr = (String) w.elementAt(0);
+       abbr = DataUtils.wrapWord(abbr); 
+       
        String def = (String) w.elementAt(1);
        String rowColor = (n%2 == 0) ? "dataRowDark" : "dataRowLight";
         %>