Changeset 26087 for main

Timestamp:

2012-08-09T11:24:50+12:00 (12 years ago)

Author:

kjdon

Message:

extractMetadataNames now only looks for relation info (parent, ancestors etc). Position, separator etc is done by xslt

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

@@ -97 +97 @@
     }
 
-    protected void extractMetadataNames(Element format, HashSet<String> meta_names)
-    {
-        NodeList metadata_nodes = format.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "metadata");
-        for (int i = 0; i < metadata_nodes.getLength(); i++)
-        {
-            Element elem = (Element) metadata_nodes.item(i);
-            StringBuffer metadata = new StringBuffer();
-            String pos = elem.getAttribute("pos");
-            String name = elem.getAttribute("name");
-            String select = elem.getAttribute("select");
-            String sep = elem.getAttribute("separator");
-
-            if (pos.equals("offset"))
-            { // offset when requested to use mdoffset
-                metadata.append("offset");
-                metadata.append(GSConstants.META_RELATION_SEP);
-            }
-            else if (!pos.equals(""))
-            {
-                metadata.append("pos" + pos); // first, last or indexing number
-                metadata.append(GSConstants.META_RELATION_SEP);
-            }
-
-            if (!select.equals(""))
-            {
-                metadata.append(select);
-                metadata.append(GSConstants.META_RELATION_SEP);
-            }
-            if (!sep.equals(""))
-            {
-                metadata.append(GSConstants.META_SEPARATOR_SEP);
-                metadata.append(sep);
-                metadata.append(GSConstants.META_SEPARATOR_SEP);
-                metadata.append(GSConstants.META_RELATION_SEP);
-            }
-
-            metadata.append(name);
-            meta_names.add(metadata.toString());
-        }
+  // 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");
+      for (int i = 0; i < metadata_nodes.getLength(); i++)
+        {
+          Element elem = (Element) 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);
+        }
+          
     }