Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS3DocumentRetrieve.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

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

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

@@ -20 +20 @@
 
 // Greenstone classes
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSFile;
@@ -62 +63 @@
     // set up a macro resolver
     }
-
+    
+    public void cleanUp() {
+    super.cleanUp();
+    this.database.closeConnection();
+    }
 
     /** configure this service */
@@ -109 +114 @@
     }
     
-    /** if an id is not a greenstone id (an external id) then translate 
-    it to a greenstone one*/
-    protected String translateExternalId(String node_id){
-    // dont have this yet
-    return node_id;
-    }
-
     /** returns the id of the root node of the document containing node node_id. . may be the same as node_id */
     protected String getRootId(String node_id) {
@@ -150 +148 @@
     // assumes only one value per metadata
     protected Element getMetadataList(String node_id, boolean all_metadata,
-                      ArrayList metadata_names) {
+                      ArrayList metadata_names)   
+    throws GSException {
     Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
 
@@ -215 +214 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    abstract protected Element getNodeContent(String doc_id);
+    abstract protected Element getNodeContent(String doc_id) throws GSException;
 
 }