Changeset 10786

Timestamp:

2005-10-27T16:12:58+13:00 (18 years ago)

Author:

kjdon

Message:

fixed a bug where it was trying to get the last three chars of the id, doesn't work if the id is only two chars long

File:

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

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

@@ -157 +157 @@
     // Create a new (empty) result message
     Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
-
     String lang = request.getAttribute(GSXML.LANG_ATT);
     result.setAttribute(GSXML.FROM_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
@@ -194 +193 @@
         param = (Element) param.getNextSibling();
     }
-    
+
     // check that there has been some metadata specified
     if (!all_metadata && metadata_names_list.size()==0) {
@@ -207 +206 @@
         return result;
     }
-    
+
     // copy the request doc node list to the response
     Element response_node_list = (Element) this.doc.importNode(request_node_list, true);
@@ -219 +218 @@
         return result;
     }
-    
+
     // Whew, now we have checked (almost) all the syntax of the request, now we can process it.
     
@@ -225 +224 @@
         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?
@@ -231 +229 @@
         } else if (idNeedsTranslating(node_id)) {
         node_id = translateId(node_id);
-        }
-        
+        }       
         if (node_id == null) {
         continue;
         }
+        
         try {
         Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);
@@ -245 +243 @@
             return result;
         }
-        }
-    }
-    
+        } 
+    }
+        
     return result;
     }
@@ -581 +579 @@
     */
     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") ||