Changeset 8726

Timestamp:

2004-12-02T16:33:50+13:00 (19 years ago)

Author:

kjdon

Message:

finished the unXmlSafe method, and now unescape attribute values when returning them. need to check that I do this everywhere

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -234 +234 @@
         val=getNodeText(e); 
 
+    } else {
+        // unescape the xml stuff
+        val = unXmlSafe(val);
     }
     return val;
@@ -590 +593 @@
 
     
-//      // replaces < > " ' & in the original with their entities
-//      public static String unXmlSafe(String original) {
-
-//      StringBuffer filtered = new StringBuffer(original.length());
-//      char c;
-//      for (int i=0; i<original.length(); i++) {
-//          c = original.charAt(i);
-//          if (c == '&') {
-//          int pos = original.indexOf(";"), i);
-//          String entity = original.substring(i+1, pos);
-//          if (entity.equals("gt")) {
-//          filtered.append(">");
-//          } else if (entity.equals("lt")) {
-//          filtered.append("<");
-//          } else if (entity.equals("apos")) {
-//          filtered.append(
-//          while (c != ';') {
-            
-//          // process the entity
-//          } else {
-//          filtered.append(c);
-//          }
-//      }
-//      return filtered.toString();
-//      }
+    // replaces < > " ' & entities with their originals
+    public static String unXmlSafe(String original) {
+    
+    StringBuffer filtered = new StringBuffer(original.length());
+    char c;
+    for (int i=0; i<original.length(); i++) {
+        c = original.charAt(i);
+        if (c == '&') {
+        int pos = original.indexOf(";", i);
+        String entity = original.substring(i+1, pos);
+        if (entity.equals("gt")) {
+            filtered.append(">");
+        } else if (entity.equals("lt")) {
+            filtered.append("<");
+        } else if (entity.equals("apos")) {
+            filtered.append("'");
+        } else if (entity.equals("amp")) {
+            filtered.append("&");
+        } else if (entity.equals("quot")) {
+            filtered.append("\"");
+        } else {
+            filtered.append("&"+entity+";");
+        }
+        i = pos;
+        }
+        else {
+        filtered.append(c);
+        }
+    }
+    return filtered.toString();
+     }
 }