Changeset 30891 for main/trunk/greenstone3/src/java

Timestamp:

2016-10-20T10:34:50+13:00 (7 years ago)

Author:

kjdon

Message:

removed some commented out code. when looking up metadata, if we have an underscore we take the first part off and assume that it is a relation tag, root, parent etc. But if we have gone through our list of relations and it doesn't match, then put it back on and look up the full name, as the user may have underscores in their metadata.

File:

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

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

@@ -51 +51 @@
  * Implements the generic retrieval and classifier services for GS2 collections.
  * 
- * @author Katherine Don
- * @author Michael Dewsnip
  */
 
@@ -232 +230 @@
     }
     // we need to get metadata for one or more different nodes
+    // we have a relation root, parent, ancestors, siblings, children, descendents
     String relation = metadata.substring(0, index);
     String relation_id="";
@@ -304 +303 @@
     }
     // unknown relation
-    logger.error("asked for relation "+relation+" and don't understand it.");
-    return null;
+    logger.error("asked for relation "+relation+" and don't understand it, so getting the full metadata name "+relation+GSConstants.META_RELATION_SEP+metadata);
+    // 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);
+
   }
       
-  //   } else {
-  //   if (relation.equals("parent") || relation.equals("ancestors")) {
-  //     relation_id = OID.getParent(node_id);
-  //     if (relation_id.equals(node_id)) {
-  //    return null;
-  //     }
-  //   } else if (relation.equals("root")) {
-  //     relation_id = OID.getTop(node_id);
-  //   }
-
-  //   DBInfo relation_info;
-  //   if (relation_id.equals(node_id)) {
-  //     relation_info = info;
-  //   } else {
-  //     relation_info = this.coll_db.getInfo(relation_id);
-  //   }
-  //   if (relation_info == null)
-  //     {
-  //    return null;
-  //     }
-
-  //   Vector<String> values = relation_info.getMultiInfo(metadata);
-  //   // do resolving
-  //   if (!relation.equals("ancestors")){
-  //     return values;
-  //   }
-
-  //   // ancestors: go up the chain
-
-  //   String current_id = relation_id;
-  //   relation_id = OID.getParent(current_id);
-  //   while (!relation_id.equals(current_id))
-  //     {
-  //    relation_info = this.coll_db.getInfo(relation_id);
-  //    if (relation_info == null)
-  //      return values;
-    
-  //    Vector<String> more_values = relation_info.getMultiInfo(metadata);
-  //    if (more_values != null)
-  //      {
-  //        values.addAll(0, more_values);
-  //      }
-    
-            
-  //    current_id = relation_id;
-  //    relation_id = OID.getParent(current_id);
-  //     }
-  //   return values; // for now
-  // }
 
     protected Vector<String> getMetaValuesForOID(String oid, String metadata) {