- Timestamp:
- 2012-09-18T15:19:18+12:00 (12 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java
r26089 r26198 287 287 try 288 288 { 289 Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);289 Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list, lang); 290 290 if (metadata_list != null) 291 291 { … … 759 759 * <metadataList><metadata name="xxx">value</metadata></metadataList> 760 760 */ 761 abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException;761 abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException; 762 762 763 763 /** -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java
r26090 r26198 138 138 GS2MacroResolver gs2_macro_resolver = (GS2MacroResolver) this.macro_resolver; 139 139 gs2_macro_resolver.setDB(this.coll_db); 140 140 // set the class loader in case we have collection specific properties files 141 gs2_macro_resolver.setClassLoader(this.class_loader); 141 142 return true; 142 143 } … … 173 174 * name="xxx">value</metadata></metadataList> 174 175 */ 175 protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException176 protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException 176 177 { 177 178 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER); … … 181 182 return null; 182 183 } 183 String lang = "en"; // why do we need this??184 184 185 if (all_metadata) // this will get all metadata for current node 185 186 { … … 194 195 for (int i = 0; i < values.size(); i++) 195 196 { 196 197 GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id)); 197 198 } 198 199 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java
r26088 r26198 106 106 return false; 107 107 } 108 this.macro_resolver = new GS2MacroResolver(this.coll_db );108 this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader); 109 109 110 110 gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, index_stem);
Note:
See TracChangeset
for help on using the changeset viewer.