Changeset 26473 for main/trunk

Timestamp:

2012-11-20T06:10:39+13:00 (11 years ago)

Author:

davidb

Message:

Block of code added to monitors for the new '<gsf:foreach-metadata>' tag and adds it to the list of metadata terms to be retrieved

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -200 +200 @@
             Document currentDoc = this.converter.getDOM(currentFile);
             NodeList metadataElems = currentDoc.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "metadata"); //gsf:metadata
+            NodeList foreachMetadataElems = currentDoc.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "foreach-metadata"); //gsf:foreach-metadata
             NodeList imageElems = currentDoc.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "image"); //gsf:image
             NodeList includeElems = currentDoc.getElementsByTagNameNS(GSXML.XSL_NAMESPACE, "include");
@@ -208 +209 @@
             {
                 Element current = (Element) metadataElems.item(i);
+                String name = current.getAttribute(GSXML.NAME_ATT);
+                if (name != null && name.length() > 0 && !names.contains(name))
+                {
+                    names.add(name);
+                }
+            }
+
+            for (int i = 0; i < foreachMetadataElems.getLength(); i++)
+            {
+                Element current = (Element) foreachMetadataElems.item(i);
                 String name = current.getAttribute(GSXML.NAME_ATT);
                 if (name != null && name.length() > 0 && !names.contains(name))