Changeset 26198 for main/trunk

Timestamp:

2012-09-18T15:19:18+12:00 (12 years ago)

Author:

kjdon

Message:

getMetadataList needs a language param, as we may need to look up a dictionary for macro resolving. and set a class loader for the macro resolver so we can have collection specific dictionaries

Location:

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

Files:

• AbstractDocumentRetrieve.java (modified) (2 diffs)
• AbstractGS2DocumentRetrieve.java (modified) (4 diffs)
• GS2Browse.java (modified) (1 diff)

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

@@ -287 +287 @@
             try
             {
-                Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);
+              Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list, lang);
                 if (metadata_list != null)
                 {
@@ -759 +759 @@
      * <metadataList><metadata name="xxx">value</metadata></metadataList>
      */
-    abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException;
+  abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException;
 
     /**

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

@@ -138 +138 @@
         GS2MacroResolver gs2_macro_resolver = (GS2MacroResolver) this.macro_resolver;
         gs2_macro_resolver.setDB(this.coll_db);
-
+        // set the class loader in case we have collection specific properties files
+        gs2_macro_resolver.setClassLoader(this.class_loader);
         return true;
     }
@@ -173 +174 @@
      * name="xxx">value</metadata></metadataList>
      */
-    protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException
+  protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException
     {
         Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
@@ -181 +182 @@
             return null;
         }
-        String lang = "en"; // why do we need this??
+        
         if (all_metadata) // this will get all metadata for current node
         {
@@ -194 +195 @@
                 for (int i = 0; i < values.size(); i++)
                 {
-                    GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
+                  GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
                 }
             }

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

@@ -106 +106 @@
             return false;
         }
-        this.macro_resolver = new GS2MacroResolver(this.coll_db);
+        this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader);
         
         gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, index_stem);