Changeset 7530

Timestamp:

2004-06-02T12:00:03+12:00 (20 years ago)

Author:

kjdon

Message:

hacked this so that it reads in attribute values that contain spaces - if the value starts with ' and doesn't end with ' then read in tokens until it does.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShellElement.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GShellElement.java

@@ -29 +29 @@
 import java.util.StringTokenizer;
 import org.greenstone.gatherer.util.StaticStrings;
+
 /** This class wraps around a pseudo-XML message we have recieved from an external script, and allows access to the element name, attributes etc via method calls. */
 public class GShellElement {
@@ -35 +36 @@
     private String element_name;
     /** Create a new element around the message string. The string is expected to start with < and end with > */
+    /** this is a hack - why aren't we using proper XML parsing?? */
     public GShellElement(String message) {
     // Remove the angle brackets
@@ -62 +64 @@
             attribute_value = attribute_value.substring(0, attribute_value.length() - 1);
         }
-        // We may have to strip ' marks off value
-        if(attribute_value.startsWith(StaticStrings.SINGLE_QUOTE_CHARACTER) && attribute_value.endsWith(StaticStrings.SINGLE_QUOTE_CHARACTER)) {
-            attribute_value = attribute_value.substring(1, attribute_value.length() - 1);
+        // We may have to strip ' marks off value - if it starts with ' and doesn't end with ' we read in more tokens until we get an ending '
+        if(attribute_value.startsWith(StaticStrings.SINGLE_QUOTE_CHARACTER)) {
+            while (!attribute_value.endsWith(StaticStrings.SINGLE_QUOTE_CHARACTER) && tokenizer.hasMoreTokens()) {
+            attribute_value += " "+tokenizer.nextToken();
+            }
+            if (attribute_value.endsWith(StaticStrings.SINGLE_QUOTE_CHARACTER)) {
+            attribute_value = attribute_value.substring(1, attribute_value.length() - 1);
+            }
         }
         if(attributes == null) {