Changeset 7823

Timestamp:

2004-07-29T09:24:24+12:00 (20 years ago)

Author:

kjdon

Message:

check that the content retrieved from MG is not null before using it

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java (modified) (2 diffs)

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

@@ -105 +105 @@
     
     // The location of the MG index and text files
-    String basedir = GSFile.collectionBaseDir(this.site_home, this.cluster_name)
-                          + File.separatorChar;  // Needed by MG
+    String basedir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar;  // Needed by MG
     String textdir = GSFile.collectionTextPath(this.cluster_name);
     // index is only needed to start up MG, not used so just use the default index
@@ -121 +120 @@
         }
         long doc_num = this.gdbm_src.oid2Docnum(doc_id);
+
         String doc_content = this.mg_src.getDocument(basedir, textdir, doc_num);
-        // remove any ctrl-c or ctrl-b (I hope these are the right codes)
-        doc_content = doc_content.replaceAll("\u0002|\u0003", "");
-        // replace _httpimg_ with the correct address
-        doc_content = resolveImages(doc_content, doc_id);
-        // Stick it in a text node
+        // Create the  text node
         Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
-        GSXML.addDocText(this.doc, doc, doc_content);
         doc_list.appendChild(doc);
+        
+        if (doc_content!=null) {
+        System.err.println("got the content");
+        // remove any ctrl-c or ctrl-b (I hope these are the right codes)
+        //System.err.println("doc content "+doc_content);
+        doc_content = doc_content.replaceAll("\u0002|\u0003", "");
+        // replace _httpimg_ with the correct address
+        doc_content = resolveImages(doc_content, doc_id);
+        GSXML.addDocText(this.doc, doc, doc_content);
+        } else {
+        System.err.println("the doc content was null, not getting that section\n");
+        GSXML.addDocText(this.doc, doc, "couldn't retrieve content for this section\n");
+        }
     }