- Timestamp:
- 2015-06-24T14:19:42+12:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java
r28966 r29990 28 28 import org.greenstone.gsdl3.util.BasicDocumentDatabase; 29 29 import org.greenstone.gsdl3.util.DBInfo; 30 import org.greenstone.gsdl3.util.MacroResolver; 30 31 import org.greenstone.gsdl3.util.GS2MacroResolver; 31 32 import org.greenstone.gsdl3.util.GSFile; … … 50 51 public GS2Browse() 51 52 { 53 this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader); 52 54 } 53 55 … … 107 109 return false; 108 110 } 109 this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader);111 110 112 111 113 gs_doc_db = new BasicDocumentDatabase(database_type, this.site_home, this.cluster_name, index_stem); … … 190 192 String key = it.next(); 191 193 String value = info.getInfo(key); 192 GSXML.addMetadata(metadata_list, key, value);194 GSXML.addMetadata(metadata_list, key, this.macro_resolver.resolve(value, lang, MacroResolver.SCOPE_META, node_id)); 193 195 } 194 196 … … 200 202 String meta_name = metadata_names.get(i); 201 203 String value = (String) info.getInfo(meta_name); 202 GSXML.addMetadata(metadata_list, meta_name, value);204 GSXML.addMetadata(metadata_list, meta_name, this.macro_resolver.resolve(value, lang, MacroResolver.SCOPE_META, node_id)); 203 205 } 204 206 }
Note:
See TracChangeset
for help on using the changeset viewer.