Changeset 6247

Timestamp:

2003-12-12T16:34:22+13:00 (20 years ago)

Author:

kjdon

Message:

changed the metadata handling to use metadata names in the form all_relation_'sep'_meta, where all means to get multiple values for each node, relation can be parent, ancestors etc, sep is the separator string to put between values. All the preceeding bits are optional.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

@@ -766 +766 @@
     protected String getMetadata(String node_id, DBInfo info, 
                  String metadata) {
+    boolean multiple = false;
+    String relation = "";
+    String separator = ", ";
     int pos = metadata.indexOf(RELATION_SEP_CHAR);
     if (pos ==-1) {
+        // just a plain meta entry eg dc.Title
         return info.getInfo(metadata);
     }
     
-    String relation = metadata.substring(0, pos);
-    if (!relation.equals("parent") && !relation.equals("root") && !relation.startsWith("ancestors") ) {
-        // its not a valid relation 
-        return info.getInfo(metadata);
-    }
-    
-    String relation_id = "";
-    if (relation.equals("root")) {
+    String temp = metadata.substring(0, pos);
+    metadata = metadata.substring(pos+1);
+    // check for all on the front
+    if (temp.equals("all")) {
+        multiple=true;      
+        pos = metadata.indexOf(RELATION_SEP_CHAR);
+        if (pos ==-1) {
+        temp = "";
+        } else {
+        temp = metadata.substring(0, pos);
+        metadata = metadata.substring(pos+1);
+        }
+    }
+    
+    // now check for relational info
+    if (temp.equals("parent") || temp.equals("root") || temp.equals( "ancestors")) { // "current" "siblings" "children" "descendents"
+        relation = temp;
+        pos = metadata.indexOf(RELATION_SEP_CHAR);
+        if (pos == -1) {
+        temp = "";
+        } else {
+        temp = metadata.substring(0, pos);
+        metadata = metadata.substring(pos+1);
+        }
+    }
+    
+    // now look for separator info
+    if (temp.startsWith(SEPARATOR_SEP_STRING) && temp.endsWith(SEPARATOR_SEP_STRING)) {
+        separator = temp.substring(1, temp.length()-1);
+        
+    }
+    
+    String relation_id = node_id;
+    if (relation.equals("parent") || relation.equals("ancestors")) {
+        relation_id = OID.getParent(node_id);
+        // parent or ancestor does not include self
+        if (relation_id.equals(node_id)){
+        return "";
+        }
+    } else if (relation.equals("root")) {
         relation_id = OID.getTop(node_id);
+    }
+    
+    // now we either have a single node, or we have ancestors   
+    DBInfo relation_info;
+    if (relation_id.equals(node_id)) {
+        relation_info = info;
     } else {
-        relation_id = OID.getParent(node_id);
-    }
-    
-    if (relation_id.equals(node_id)){
-        // no parents or ancestors
-        return "";
-    }
-    
-    DBInfo relation_info = this.gdbm_src.getInfo(relation_id);
+        relation_info = this.gdbm_src.getInfo(relation_id);
+    }
     if (relation_info == null) {
         return "";
     }
-    
-    String new_meta = metadata.substring(pos+1);
-    if (relation.equals("parent") || relation.equals("root")) {
-        return relation_info.getInfo(new_meta);
-    }
-    
-    // do ancestor stuff
-    // get teh separating string
-    String items [] = relation.split(SEPARATOR_SEP_STRING);
-    String separator = "";
-    if (items.length > 1) {
-        separator = items[1];
-        relation = items[0];
-    }
-    
-    StringBuffer value = new StringBuffer();
-    value.append(relation_info.getInfo(new_meta));
+
+    StringBuffer result = new StringBuffer();
+
+    if (!multiple) {
+        result.append(relation_info.getInfo(metadata));
+    } else {
+        // we have multiple meta
+        Vector values = relation_info.getMultiInfo(metadata);
+        if (values != null) {
+        boolean first = true;
+        for (int i=0; i<values.size(); i++) {
+            if (first) {
+            first = false;
+            } else {
+            result.append(separator);
+            }
+            result.append(values.elementAt(i));
+        }
+        }
+    }
+    // if not ancestors, then this is all we do
+    if (!relation.equals("ancestors")) {
+        return result.toString();
+    }
+    
+    // now do the ancestors 
     String current_id = relation_id;
     relation_id = OID.getParent(current_id);
     while (!relation_id.equals(current_id)) {
         relation_info = this.gdbm_src.getInfo(relation_id);
-        if (relation_info == null) return value.toString();
-        value.insert(0, separator);
-        value.insert(0, relation_info.getInfo(new_meta));
-        
+        if (relation_info == null) return result.toString();
+        if (!multiple) {
+        result.insert(0, separator);
+        result.insert(0, relation_info.getInfo(metadata));
+        } else {
+        Vector values = relation_info.getMultiInfo(metadata);
+        if (values != null) {
+            for (int i=values.size()-1; i>=0; i--) {
+            result.insert(0, separator);
+            result.insert(0, values.elementAt(i));
+            }
+        }
+        
+        }
         current_id = relation_id;
         relation_id = OID.getParent(current_id);
     } 
     
-    return value.toString();
+    return result.toString();
     }