Changeset 6248

Timestamp:

2003-12-12T16:35:38+13:00 (20 years ago)

Author:

kjdon

Message:

updated the extractMetadataNames method to account for the new format stuff

File:

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

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

@@ -71 +71 @@
     NodeList nodes = format.getElementsByTagName("gsf:metadata");
         for (int i=0; i<nodes.getLength(); i++) {
-        String name = ((Element)nodes.item(i)).getAttribute("name");
-        String select = ((Element)nodes.item(i)).getAttribute("select");
-        if (select.equals("")) {
-        meta_names.add(name);
-        } else if (select.equals("ancestors")) {
-        String separator = ((Element)nodes.item(i)).getAttribute("separator");
-        meta_names.add("ancestors'"+separator+"'_"+name);
-        } else {
-        meta_names.add(select+"_"+name);
-        }      
-        
-        }
+        Element elem = (Element)nodes.item(i);
+        StringBuffer metadata = new StringBuffer();
+        String all = elem.getAttribute("multiple");
+        String name = elem.getAttribute("name");
+        String select = elem.getAttribute("select");
+        String sep = elem.getAttribute("separator");
+        if (all.equals("true")) {
+        metadata.append("all_");
+        }
+        if (!select.equals("")) {
+        metadata.append(select);
+        metadata.append("_");
+        }
+        if (!sep.equals("")) {
+        metadata.append("'");
+        metadata.append(sep);
+        metadata.append("'");
+        metadata.append("_");
+        }
+
+        metadata.append(name);
+        meta_names.add(metadata.toString());
+    }
+    
     nodes = format.getElementsByTagName("gsf:option");
         for (int i=0; i<nodes.getLength(); i++) {