Changeset 5834

Timestamp:

2003-11-13T14:04:29+13:00 (20 years ago)

Author:

kjdon

Message:

added a new line back in to description, and now use Codec instead of Utility.decodeGreenstone to transform the description

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionConfiguration.java (modified) (3 diffs)

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

@@ -71 +71 @@
                 temp = tokenizer.nextToken();
                 // check for language
-                String language = "";
+                String language = "en"; // assume the no-lang ones are english, but we shouldn't really do this.
                 if(temp.startsWith("[") && temp.endsWith("]")) {
                     language = temp.substring(temp.indexOf("=") + 1, temp.length() - 1); 
@@ -82 +82 @@
                     Gatherer.println("we have found a starting quote but not an ending quote, so now read lines until we get to an end quote");
                     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;
@@ -111 +113 @@
                     if (name==null || language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
                     name= Utility.decodeGreenstone(temp);
+                    // should we use Codec here too?
+                    
                     }
                     
                 } else if (meta_type.equalsIgnoreCase("collectionextra")) {
                     if (description == null|| language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
-                    description = Utility.decodeGreenstone(temp);
+                    //description = Utility.decodeGreenstone(temp);
                     // or should we use codec??
-                    // description = Codec.transform(temp, Codec.GREENSTONE_TO_TEXT);
+                    description = Codec.transform(temp, Codec.GREENSTONE_TO_TEXT);
                     }
                 }