Changeset 11279

Timestamp:

2006-02-17T11:37:59+13:00 (18 years ago)

Author:

kjdon

Message:

idNeedsTranslating now call OID.needsTranslating, also added a check for null parent id before using in when getting siblings

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java (modified) (5 diffs)

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

@@ -27 +27 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.MacroResolver;
+import org.greenstone.gsdl3.util.OID;
 
 // XML classes
@@ -236 +237 @@
         Element request_node = (Element) request_nodes.item(i);
         String node_id = request_node.getAttribute(GSXML.NODE_ID_ATT);
+
         if (external_id) {
         // can we have .pr etc extensions with external ids?
@@ -245 +247 @@
         continue;
         }
-        
         try {
         Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);
@@ -434 +435 @@
         //Siblings: get the other descendants of the selected node's parent
         if (want_siblings) {
+            String parent_id = getParentId(doc_id);
+            if (parent_id != null) {
+            // if parent == current id, then we are at the top 
+            // and can't get siblings
+            Element parent_node = (Element)base_node.getParentNode(); // this may be the structure element if there has been no request for parents or ancestors
             
-            Element parent_node = (Element)base_node.getParentNode(); // this may be the structure element if there has been no request for parents or ancestors
-            String parent_id = getParentId(doc_id);
-            // add siblings, - returns a pointer to the new current node 
-            base_node = addSiblings(parent_node, parent_id, doc_id);
+            // add siblings, - returns a pointer to the new current node 
+            base_node = addSiblings(parent_node, parent_id, doc_id);
+            }
+
         }
         
@@ -591 +597 @@
     */
     protected boolean idNeedsTranslating(String id) {
-    if (id.length()<5) return false;
-    String tail = id.substring(id.length()-3);
-    return (tail.equals(".fc") || tail.equals(".lc") || 
-        tail.equals(".pr") || tail.equals(".ns") || 
-        tail.equals(".ps") || tail.equals(".rt") || 
-        tail.equals(".ss"));
-
+    return OID.needsTranslating(id);
     }