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

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

@@ -21 +21 @@
 // Greenstone classes
 import org.greenstone.mgpp.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -47 +48 @@
     }
 
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
+    }
+
     /** configure this service */
     public boolean configure(Element info, Element extra_info)
     {
+    // Do generic configuration
+    if (!super.configure(info, extra_info)) {
+        return false;
+    }
+
     // Do specific configuration
     System.out.println("Configuring GS3MGPPRetrieve...");
@@ -66 +77 @@
     // The location of the MGPP text files
     mgpp_textdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) +
-        File.separatorChar + GSFile.collectionTextPath(this.cluster_name);
+        File.separatorChar + GSFile.collectionTextPath(this.index_stem);
 
-    // Do generic configuration
-    return super.configure(info, extra_info);
- 
+    return true;
     }
     
@@ -77 +86 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id) throws GSException {
     if (GS3OID.isDocTop(doc_id) && database.isHierarchicalDocument(doc_id)) {
         // if we have a whole doc id, and the document is hierarchical,