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

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

@@ -21 +21 @@
 // Greenstone classes
 import org.greenstone.mg.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -42 +43 @@
     private String mg_textdir = null;
     private String default_index = null;
+    
     public GS3MGRetrieve() {
     this.mg_src = new MGWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
     }
 
@@ -86 +93 @@
      * <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)) {
@@ -111 +118 @@
     } catch (Exception e) {
         System.out.println("exception happended with mg_src.getDocument()");
-        doc_content = "this is the content for section hash id "+ doc_id+", mg doc num "+doc_int+"\n";
+        throw new GSException("Couldn't get document content for id: "+ doc_int+"\n"+e.getMessage());
+        //doc_content = "this is the content for section hash id "+ doc_id+", mg doc num "+doc_int+"\n";
     }