Changeset 33341

Timestamp:

2019-07-23T11:07:30+12:00 (5 years ago)

Author:

kjdon

Message:

tidied up relational metadata retrieval. implemented descendants and entire. make all metadata come from getMetaValuesForOID - that way all get the [xxx] metadata replacement opportunity. now it handles [parent(Top):assocfilepath]

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -227 +227 @@
     if (index == -1) {
       // metadata is for this node
-      return info.getMultiInfo(metadata);
+      return getMetaValuesForOID(node_id, current_info, metadata);
     }
     // we need to get metadata for one or more different nodes
-    // we have a relation root, parent, ancestors, siblings, children, descendents
+    // we have a relation root, parent, ancestors, siblings, children, descendants, entire
     String relation = metadata.substring(0, index);
     String relation_id="";
@@ -236 +236 @@
     if (relation.equals("root")) {
       relation_id = OID.getTop(node_id);
-      if (relation_id.equals(node_id)) {
-    // use the current node info
-    return info.getMultiInfo(metadata);
-      } else {
-    return getMetaValuesForOID(relation_id, metadata);
-      }
-    }
+      if (!relation_id.equals(node_id)) {
+    // get the dbinfo for the root node
+    current_info = this.coll_db.getInfo(relation_id);
+      }
+      return getMetaValuesForOID(relation_id, current_info, metadata);
+    }
+    
     if (relation.equals("parent")) {
       relation_id = OID.getParent(node_id);
@@ -249 +249 @@
     return null;
       }
-      return getMetaValuesForOID(relation_id, metadata);
+      return getMetaValuesForOID(relation_id, null, metadata);
     }
 
@@ -261 +261 @@
       while (!relation_id.equals(current_id)) {
     
-    Vector<String> more_values = getMetaValuesForOID(relation_id, metadata);
+    Vector<String> more_values = getMetaValuesForOID(relation_id, null, metadata);
     if (more_values != null) {
       values.addAll(0, more_values);
@@ -283 +283 @@
     return null;
       }
-    }
+      // drop through to children part
+    }
+
+    Vector<String> values = new Vector<String>();
     if (relation.equals("children")) {
-      Vector<String> values = new Vector<String>();
-      String contains = current_info.getInfo("contains");
+      processChildren(node_id, current_info, metadata, values, false);
+     return values;
+    }
+    
+    if (relation.equals("entire")) {
+      // this is the same as doing descendants on root
+      relation_id = OID.getTop(node_id);
+      
+      // first of all, add root node info
+      
+      if (relation_id.equals(node_id)) {
+    current_info = info;
+      } else {
+    current_info = this.coll_db.getInfo(relation_id);
+      }
+      values = getMetaValuesForOID(relation_id, current_info, metadata);
+
+      node_id = relation_id;
+      relation = "descendants";
+      // drop through to next part
+    }
+
+
+    if (relation.equals("descendants")) {
+      processChildren(node_id, current_info, metadata, values, true);
+      return values;
+    }
+    // unknown relation
+    // we assume that maybe the metadata has an _ in the name, so get the original name
+    return info.getMultiInfo(relation+GSConstants.META_RELATION_SEP+metadata);
+
+  }
+      
+    protected void processChildren(String node_id, DBInfo info, String metadata, Vector<String> values,
+                   boolean recursive) {
+      String contains = info.getInfo("contains");
       contains = StringUtils.replace(contains, "\"", node_id);
       String[] children = contains.split(";"); 
@@ -292 +329 @@
     
     String child_id = children[i];
-    Vector<String> more_values = getMetaValuesForOID(child_id, metadata);
+    Vector<String> more_values = getMetaValuesForOID(child_id, null, metadata);
     if (more_values != null) {
       values.addAll(more_values);
     }
-      }
-      return values;
-    } 
-    if (relation.equals("descendents")) {
+    if (recursive) {
+       DBInfo child_info = this.coll_db.getInfo(child_id);
+       processChildren(child_id, child_info, metadata, values, recursive);
+    }
+      }
+    }
+    
+  protected Vector<String> getMetaValuesForOID(String oid, DBInfo info, String metadata) {
+    
+    DBInfo this_info;
+    if (info != null) {
+      this_info = info;
+    } else {
+      this_info = this.coll_db.getInfo(oid);
+    }
+    if (this_info == null) {
       return null;
     }
-    // unknown relation
-    // we assume that maybe the metadata has an _ in the name, so get the original name
-    return info.getMultiInfo(relation+GSConstants.META_RELATION_SEP+metadata);
-
-  }
       
-
-    protected Vector<String> getMetaValuesForOID(String oid, String metadata) {
-      DBInfo info = this.coll_db.getInfo(oid);
-      if (info == null) {
-    return null;
-      }
-      
-      Vector<String> values = info.getMultiInfo(metadata);
+      Vector<String> values = this_info.getMultiInfo(metadata);
       // lets look through the values and look for [xxx] things. We need to look up metadata for them.
       if (values == null) { return values; }
@@ -326 +363 @@
       for (int i=0; i<metas.length; i++) {
         String meta = metas[i];
-        String meta_val = info.getInfo(meta);
+        String meta_val;
+        // hack for parent(Top). gs2 had lots of other modifiers, but is this the only one that was used in
+        // metadata values??
+        if (meta.startsWith("parent(Top):")) {
+          String nmeta = meta.substring(12); // or 13?
+          String root_id = OID.getTop(oid);
+          DBInfo root_info = this.coll_db.getInfo(root_id);
+          meta_val = root_info.getInfo(nmeta);
+        } else {
+          meta_val = this_info.getInfo(meta);
+        }
         if (!meta_val.equals("")) {
           val = StringUtils.replace(val,"["+meta+"]",meta_val);