Changeset 29990

Timestamp:

2015-06-24T14:19:42+12:00 (9 years ago)

Author:

kjdon

Message:

classifier metadata can have macros, eg _textmonth06_ in a datelist. So pass meta values to macro resolver. Also, need to initialise the macro resolver in constructor so that super.configure can load the macros in to it

File:

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

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

@@ -28 +28 @@
 import org.greenstone.gsdl3.util.BasicDocumentDatabase;
 import org.greenstone.gsdl3.util.DBInfo;
+import org.greenstone.gsdl3.util.MacroResolver;
 import org.greenstone.gsdl3.util.GS2MacroResolver;
 import org.greenstone.gsdl3.util.GSFile;
@@ -50 +51 @@
     public GS2Browse()
     {
+      this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader);
     }
 
@@ -107 +109 @@
             return false;
         }
-        this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader);
+        
         
         gs_doc_db = new BasicDocumentDatabase(database_type, this.site_home, this.cluster_name, index_stem);
@@ -190 +192 @@
                 String key = it.next();
                 String value = info.getInfo(key);
-                GSXML.addMetadata(metadata_list, key, value);
+                GSXML.addMetadata(metadata_list, key, this.macro_resolver.resolve(value, lang, MacroResolver.SCOPE_META, node_id));
             }
 
@@ -200 +202 @@
                 String meta_name = metadata_names.get(i);
                 String value = (String) info.getInfo(meta_name);
-                GSXML.addMetadata(metadata_list, meta_name, value);
+                GSXML.addMetadata(metadata_list, meta_name, this.macro_resolver.resolve(value, lang, MacroResolver.SCOPE_META, node_id));
             }
         }