Changeset 26491

Timestamp:

2012-11-21T01:48:53+13:00 (11 years ago)

Author:

davidb

Message:

Another place where we now also want to check for gsf:foreach-metadata

File:

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

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

@@ -101 +101 @@
   protected void extractMetadataNames(Element format, HashSet<String> meta_names)
     {
-
-      NodeList metadata_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "metadata");
+        
+      NodeList metadata_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "metadata"); // gsf:metadata
       for (int i = 0; i < metadata_nodes.getLength(); i++)
         {
@@ -115 +115 @@
         }
           
+      NodeList foreach_metadata_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "foreach-metadata"); // gsf:foreach-metadata
+      for (int i = 0; i < foreach_metadata_nodes.getLength(); i++)
+        {
+          Element elem = (Element) foreach_metadata_nodes.item(i);
+          String name = elem.getAttribute("name");
+          String select = elem.getAttribute("select");
+
+          if (!select.equals("")) {
+        name = select+GSConstants.META_RELATION_SEP+name;
+          }
+          meta_names.add(name);
+        }         
     }