Changeset 37514 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

Timestamp:

2023-03-16T19:42:42+13:00 (14 months ago)

Author:

kjdon

Message:

usign the new GetRequiredMEtadataNames - has an extra arg, and we no longer need to do teh extraMEtadataList bit ourselves, as its now in getRequiredMetadataNames

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

@@ -124 +124 @@
         // add the format info into the response
         Element format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM);
+                Element this_format = null;
         if (format_elem != null)
         {
             // find the one for the classifier we are in
-            Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
+            this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
             if (this_format == null)
             {
@@ -140 +141 @@
                 }
                 Element new_format = GSXML.duplicateWithNewName(doc, this_format, GSXML.FORMAT_ELEM, false);
-                // set teh format type
+                // set the format type
                 new_format.setAttribute(GSXML.TYPE_ATT, "browse");
 
                 page_response.appendChild(new_format);
-                getRequiredMetadataNames(new_format, metadata_names);
-            }
-        }
-        
-        Element extraMetaListElem = (Element) GSXML.getChildByTagName(request, GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
-        if(extraMetaListElem != null)
-        {
-            NodeList extraMetaList = extraMetaListElem.getElementsByTagName(GSXML.EXTRA_METADATA);
-            for(int i = 0; i < extraMetaList.getLength(); i++)
-            {
-                metadata_names.add(((Element)extraMetaList.item(i)).getAttribute(GSXML.NAME_ATT));
-            }
-        }
-
-        logger.info("extracted meta names, " + metadata_names.toString());
+            }
+        }
+                getRequiredMetadataNames(metadata_names, this_format, request);
+
+        //logger.info("extracted meta names, " + metadata_names.toString());
         // get the browse structure for the selected node
         Element classify_message = doc.createElement(GSXML.MESSAGE_ELEM);