Changeset 26088 for main

Timestamp:

2012-08-09T11:25:41+12:00 (12 years ago)

Author:

kjdon

Message:

removed macro resolve - shouldn't need it for classifier metadata

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

@@ -170 +170 @@
      */
     // assumes only one value per metadata
+  // does no macro resolving. assumes classifier metadata will not have macros.
     protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names)
     {
@@ -188 +189 @@
                 String key = it.next();
                 String value = info.getInfo(key);
-                GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(value, lang, GS2MacroResolver.SCOPE_META, node_id));
+                GSXML.addMetadata(this.doc, metadata_list, key, value);
             }