Changeset 6678

Timestamp:

2004-02-02T11:27:49+13:00 (20 years ago)

Author:

nzdl

Message:

when determining what metadata is needed to retrieve, now uses constsnts from GSConstants instead of hard coded ' and _

File:

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

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

@@ -78 +78 @@
         String sep = elem.getAttribute("separator");
         if (all.equals("true")) {
-        metadata.append("all_");
+        metadata.append("all");
+        metadata.append(GSConstants.META_RELATION_SEP);
         }
         if (!select.equals("")) {
         metadata.append(select);
-        metadata.append("_");
+        metadata.append(GSConstants.META_RELATION_SEP);
         }
         if (!sep.equals("")) {
-        metadata.append("'");
+        metadata.append(GSConstants.META_SEPARATOR_SEP);
         metadata.append(sep);
-        metadata.append("'");
-        metadata.append("_");
+        metadata.append(GSConstants.META_SEPARATOR_SEP);
+        metadata.append(GSConstants.META_RELATION_SEP);
         }
 
@@ -100 +101 @@
         meta_names.add(name);
     }
-    nodes = format.getElementsByTagName("gsf:switch");
+    /*nodes = format.getElementsByTagName("gsf:switch");
         for (int i=0; i<nodes.getLength(); i++) {
         String name = ((Element)nodes.item(i)).getAttribute("metadata");
         meta_names.add(name);
-    }
+        }*/
     
     }