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

Timestamp:

2016-06-20T12:46:42+12:00 (8 years ago)

Author:

kjdon

Message:

use the new GSXSLT.findExtraMetadataNames in action and transformingReceptionist instead of these two places each implementing this functionality and doing it differently

File:

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

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

@@ -92 +92 @@
     }
 
-    protected void getRequiredMetadataNames(Element format, HashSet<String> meta_names)
-    {
-        extractMetadataNames(format, meta_names);
-        addLinkMetadataNames(format, meta_names);
-    }
-
-    // should change to metadataList?? and use attributes for select rather than
-    // prepending parent_ etc
-    protected void extractMetadataNames(Element format, HashSet<String> meta_names)
-    {
-        NodeList metadata_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "metadata"); // gsf:metadata
-        for (int i = 0; i < metadata_nodes.getLength(); i++)
-        {
-            Element elem = (Element) metadata_nodes.item(i);
-            String full_name = elem.getAttribute("name");
-            String select = elem.getAttribute("select");
-            
-            String []names = full_name.split(",");
-            for(int j=0; j<names.length; j++) {
-            
-              String name = names[j];
-              if (!select.equals(""))
-                {
-                  name = select + GSConstants.META_RELATION_SEP + name;
-                }
-              meta_names.add(name);
-            }
-        }
-
-        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);
-        }
-    }
-
-    protected void addLinkMetadataNames(Element format, HashSet<String> meta_names)
-    {
-        // The XSL tranform for
-        //   gsf:link type="source" 
-        // makes use of 'assocfilepath' so need to make sure it's asked for
-
-        boolean getEquivLinkMeta = false;
-
-        NodeList link_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "link");
-        for (int i = 0; i < link_nodes.getLength(); i++)
-        {
-            Element elem = (Element) link_nodes.item(i);
-            String type = elem.getAttribute("type");
-            if (type.equals("source"))
-            {
-                meta_names.add("assocfilepath");
-                meta_names.add("srclinkFile");
-            }
-            else if (type.equals("web"))
-            {
-                meta_names.add("weblink");
-                meta_names.add("webicon");
-                meta_names.add("/weblink");
-            }
-            else if (type.equals("equivdoc"))
-            {
-                getEquivLinkMeta = true;
-            }
-        }
-
-        // get all the metadata necessary for when the user has used "gsf:equivlink"
-        // so that we can build up the equivlink from the metadata components it needs
-        link_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "equivlinkgs3");
-        if (getEquivLinkMeta || link_nodes.getLength() > 0)
-        {
-            String[] equivlink_metanames = { "equivDocIcon", "equivDocLink", "/equivDocLink" };
-
-            for (int i = 0; i < equivlink_metanames.length; i++)
-            {
-                StringBuffer metadata = new StringBuffer();
-                metadata.append("all"); // this means the attr multiple = true;
-                metadata.append(GSConstants.META_RELATION_SEP);
-
-                metadata.append(GSConstants.META_SEPARATOR_SEP);
-                metadata.append(','); // attr separator = ","
-                metadata.append(GSConstants.META_SEPARATOR_SEP);
-                metadata.append(GSConstants.META_RELATION_SEP);
-
-                // the name of the metadata we're retrieving
-                metadata.append(equivlink_metanames[i]);
-                meta_names.add(metadata.toString());
-            }
-        }
-
-        if (format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "image").getLength() > 0)
-        {
-            meta_names.add("Thumb");
-            meta_names.add("Screen");
-            meta_names.add("SourceFile");
-        }
-    }
+  protected void getRequiredMetadataNames(Element format, HashSet<String> meta_names) {
+    GSXSLT.findExtraMetadataNames(format, meta_names);
+  }
+
 
     protected Element createMetadataParamList(Document doc, HashSet<String> metadata_names)