Changeset 5515 for trunk/gli/src

Timestamp:

2003-09-18T12:49:02+12:00 (21 years ago)

Author:

mdewsnip

Message:

Fixed some problems with hierarchical metadata.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• msm/Metadata.java (modified) (2 diffs)
• util/MetadataXML.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/Metadata.java

@@ -123 +123 @@
     // What actually gets written as the value depends on whether this is a hierarchy based element.
     GValueModel model = Gatherer.c_man.getCollection().msm.getValueTree(element);
-    if(model != null && model.isHierarchy()) {
+    /*if(model != null && model.isHierarchy()) {
         if(value != null) {
         abs_value = value.getFullPath(false);
@@ -129 +129 @@
         abs_value = model.getHIndex(abs_value);
     }
-    else {
+    else {*/
         abs_value = abs_value.replaceAll(StaticStrings.LBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.LBRACKET_PATTERN);
         abs_value = abs_value.replaceAll(StaticStrings.RBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.RBRACKET_PATTERN);
-    }
+        //}
     // Return the result
     return abs_value;

trunk/gli/src/org/greenstone/gatherer/util/MetadataXML.java

@@ -163 +163 @@
             value = value.substring(value.lastIndexOf(GValueModel.PATH_SEP) + GValueModel.PATH_SEP.length());
         }
-        write(bw, index + "\t\"" + alias + "\"\t\"" + Utility.stripNL(value) + "\"");
+        write(bw, "\"" + Utility.stripNL(value) + "\"\t" + index + "\t\"" + Utility.stripNL(value) + "\"");
         }
                 // Very important we do this, or else buffer may not have