Changeset 5650

Timestamp:

2003-10-16T11:21:20+13:00 (21 years ago)

Author:

jmt12

Message:

In order to work around the [ and ] problem, toString is format is now passed an argument to specifiy whether you want a raw text string, DOM string or Greenstone safe string.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Format.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/Format.java

@@ -37 +37 @@
 import org.greenstone.gatherer.cdm.DOMProxyListEntry;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.Codec;
 import org.w3c.dom.*;
 /** This class encapsulates all the information about a format command from the collection configuration. This includes both the 'general' formatting commands, and the commands targetted at specific classifiers or classification component types. This class is, unfortunately, the most complex in terms of DOM model support, since we have to maintain a live reference to any classifier this format applies to. We temporarily use the feature name as the format name attribute but since the order of classifiers can change, this of course gets horribly out of date. Before the CollectionDesignManager saves the CollectionConfiguration it calls a method in the FormatManager to force all of the Formats to update their name attributes.
@@ -229 +230 @@
     String value = "Error";
     if(element != null) {
-        value = MSMUtils.getValue(element);
+       value = MSMUtils.getValue(element);
+       // Decode into text
+       value = Codec.transform(value, Codec.DOM_TO_TEXT);
     }
     return value;
@@ -291 +294 @@
         }
         // Encode
-
+        value = Codec.transform(value, Codec.TEXT_TO_DOM);
         // Store in DOM
         MSMUtils.setValue(element, value);
@@ -312 +315 @@
         }
         else {
-        temp.append("\"");
-        temp.append(MSMUtils.getValue(element));
-        temp.append("\"");
+           temp.append("\"");
+           // Retrieve the DOM encoded value, decode and then append
+           value = MSMUtils.getValue(element);
+           value = Codec.transform(value, Codec.DOM_TO_TEXT);
+           temp.append(value);
+           temp.append("\"");
         }
         text = temp.toString();