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

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_

File:

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

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);