Changeset 10651 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

Timestamp:

2005-09-26T17:07:05+12:00 (19 years ago)

Author:

kjdon

Message:

made all index/gdbm db paths use indexstem instead of cluster_name

File:

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

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

@@ -52 +52 @@
     extends AbstractDocumentRetrieve {
 
-     protected static final String INDEX_STEM_ELEM = "indexStem";
-
     //    protected static final String EXTLINK_PARAM = "ext"; here or in base??    
     protected String index_stem = null;
@@ -80 +78 @@
     System.out.println("Configuring AbstractGS2DocumentRetrieve...");
     //this.config_info = info;
+    
+    // the index stem is either specified in the config file or is  the collection name
+    Element index_stem_elem = (Element) GSXML.getChildByTagName(info, GSXML.INDEX_STEM_ELEM);
+    if (index_stem_elem != null) {
+        this.index_stem = index_stem_elem.getAttribute(GSXML.NAME_ATT);
+    }
+    if (this.index_stem == null || this.index_stem.equals("")) {
+        System.err.println("AbstractGS2DocumentRetrieve.configure(): indexStem element not found, stem will default to collection name");
+        this.index_stem = this.cluster_name;
+    }
 
     // Open GDBM database for querying
-    String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name);
+    String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, this.index_stem);
     if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
         System.err.println("AbstractGS2DocumentRetrieve Error: Could not open GDBM database!");
         return false;
     }
-    
-    // the index stem is either specified in the config file or is  the collection name
-    Element index_stem_elem = (Element) GSXML.getChildByTagName(info, INDEX_STEM_ELEM);
-    if (index_stem_elem != null) {
-        this.index_stem = index_stem_elem.getAttribute(GSXML.NAME_ATT);
-    }
-    if (this.index_stem == null || this.index_stem.equals("")) {
-        System.err.println("AbstractGS2DocumentRetrieve.configure(): indexStem element not found, stem will default to collection name");
-        this.index_stem = this.cluster_name;
-    }
+
     return true;
     }