Changeset 5910

Timestamp:

2003-11-20T10:51:54+13:00 (20 years ago)

Author:

mdewsnip

Message:

Removed quotes around collection meta items.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionConfiguration.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionConfiguration.java

@@ -79 +79 @@
                 // now we need to read in the whole of the entry - may span multiple lines, may be surrounded by single or double quotes
                 String start_string = temp.substring(0,1);
-                if ((start_string.equals("\"") || start_string.equals("\'")) && (!temp.endsWith(start_string) || temp.length()==1)) {
-
-                    StringBuffer value_raw = new StringBuffer(temp.substring(1));
-                    // add the new line back in
-                    value_raw.append(StaticStrings.NEW_LINE_CHAR);
-                    int pos = value_raw.indexOf(start_string);
-                    int old_pos = 0;
-                    while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
-                    old_pos = pos+1;
-                    pos = value_raw.indexOf(start_string, old_pos);
-                    }
-                    while(pos == -1) {
-                    String next_line = br.readLine();
-                    if(next_line != null) {
-                        value_raw.append(next_line);
-                        value_raw.append(StaticStrings.NEW_LINE_CHAR);
-                    }
-                    next_line = null;
-                    pos = value_raw.indexOf(start_string, old_pos);
+                if (start_string.equals("\"") || start_string.equals("\'")) {
+                    if (temp.endsWith(start_string) && temp.length() != 1) {
+                    temp = temp.substring(1, temp.length() - 1);
+                    }
+                    else {
+                    StringBuffer value_raw = new StringBuffer(temp.substring(1));
+                    // add the new line back in
+                    value_raw.append(StaticStrings.NEW_LINE_CHAR);
+                    int pos = value_raw.indexOf(start_string);
+                    int old_pos = 0;
                     while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
                         old_pos = pos+1;
                         pos = value_raw.indexOf(start_string, old_pos);
                     }
-                    }
-                    
-                    temp = value_raw.substring(0, value_raw.lastIndexOf(start_string));
-                    value_raw = null;
-                    
+                    while(pos == -1) {
+                        String next_line = br.readLine();
+                        if(next_line != null) {
+                        value_raw.append(next_line);
+                        value_raw.append(StaticStrings.NEW_LINE_CHAR);
+                        }
+                        next_line = null;
+                        pos = value_raw.indexOf(start_string, old_pos);
+                        while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
+                        old_pos = pos+1;
+                        pos = value_raw.indexOf(start_string, old_pos);
+                        }
+                    }
+
+                    temp = value_raw.substring(0, value_raw.lastIndexOf(start_string));
+                    value_raw = null;
+                    }
                 }