Changeset 13567

Timestamp:

2007-01-11T14:27:38+13:00 (17 years ago)

Author:

shaoqun

Message:

the content of a document will not be retrieved if the default index is absent

File:

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

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

@@ -41 +41 @@
     // Elements used in the config file that are specific to this class
     private static final String DEFAULT_INDEX_ELEM = "defaultIndex";
+    private static final String INDEX_LIST_ELEM = "indexList";
+    private static final String INDEX_ELEM = "index";
 
     private MGWrapper mg_src = null;
@@ -46 +48 @@
     private String mg_textdir = null;
     private String default_index = null;
+    private boolean has_default_index = false;
     
     public GS2MGRetrieve() {
@@ -72 +75 @@
     }
     if (this.default_index == null || this.default_index.equals("")) {
-        logger.error("default index not specified!");
-        return false;
+             logger.error("default index is not specified, the content of a document will not be retrieved");
+              has_default_index = false;
+          return true;
+        //}
     }
     logger.debug("Default index: " + this.default_index);
-
+       
     // The location of the MG index and text files
     mg_basedir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar;  // Needed by MG
@@ -83 +88 @@
     String indexpath = GSFile.collectionIndexPath(this.index_stem, this.default_index);
     this.mg_src.setIndex(indexpath);
-
+    has_default_index = true;
     return true;
     }
@@ -100 +105 @@
     Element content_node = this.doc.createElement(GSXML.NODE_CONTENT_ELEM);
     
-    String doc_content = this.mg_src.getDocument(this.mg_basedir,
-                             this.mg_textdir, doc_num);
-    
+         
+    String doc_content = null;
+
+    if (has_default_index ){
+            doc_content =  this.mg_src.getDocument(this.mg_basedir,
+                         this.mg_textdir, doc_num);
+    }
+ 
     if (doc_content!=null) {
         // remove any ctrl-c or ctrl-b 
@@ -111 +121 @@
     } else {
         logger.error("the doc content was null, not getting that section\n");
-        doc_content = "couldn't retrieve content for this section\n";
+        doc_content = "couldn't retrieve content for this section, please check the log file for more detail\n";
     }
     Text t = this.doc.createTextNode(doc_content);