Changeset 34215 for main

Timestamp:

2020-06-21T10:01:55+12:00 (4 years ago)

Author:

kjdon

Message:

removed hard coded lang=en, and now pass in lang to getMetadataList, so that macro resolving can work properly for classigier nodes. eg used in DateList _textmonth01_

Location:

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

Files:

• AbstractBrowse.java (modified) (2 diffs)
• GS2Browse.java (modified) (1 diff)

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

@@ -660 +660 @@
             }
 
-            Element metadata_list = getMetadataList(result_doc, node_id, all_metadata, metadata_names_list);
+            Element metadata_list = getMetadataList(result_doc, node_id, all_metadata, metadata_names_list, lang);
             new_node.appendChild(metadata_list);
         }
@@ -827 +827 @@
      * get the metadata for the classifier node node_id returns a metadataList
      * element: <metadataList><metadata
-     * name="xxx">value</metadata></metadataList> if all_metadata is true,
-     * returns all available metadata, otherwise just returns requested metadata
-     */
-  abstract protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names);
+     * name="xxx">value</metadata></metadataList>
+     * if all_metadata is true, returns all available metadata, otherwise just returns requested metadata
+     */
+    abstract protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang);
 
     /**

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

@@ -191 +191 @@
      */
     // assumes only one value per metadata
-  // does no macro resolving. assumes classifier metadata will not have macros.
-  protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names)
-    {
-        String lang = "en";
+    protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang)
+    {
+        //String lang = "en";
         Element metadata_list = doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         DBInfo info = this.coll_db.getInfo(node_id);