Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.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/AbstractGS2DocumentRetrieve.java (modified) (5 diffs)

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

@@ -20 +20 @@
 
 // Greenstone classes
-import org.greenstone.gdbm.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSFile;
@@ -27 +27 @@
 import org.greenstone.gsdl3.util.GS2MacroResolver;
 import org.greenstone.gsdl3.util.GSConstants;
-
+import org.greenstone.gsdl3.util.GDBMWrapper;
+import org.greenstone.gsdl3.util.DBInfo;
 // XML classes
 import org.w3c.dom.Document;
@@ -66 +67 @@
     }
 
-
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }
     /** configure this service */
     public boolean configure(Element info, Element extra_info)
@@ -146 +150 @@
     // 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);
     DBInfo info = this.gdbm_src.getInfo(node_id);
@@ -281 +286 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    abstract protected Element getNodeContent(String doc_id);
+    abstract protected Element getNodeContent(String doc_id) throws GSException;
 
     protected String getMetadata(String node_id, DBInfo info,