Changeset 10651

Timestamp:

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

Author:

kjdon

Message:

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

Location:

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

Files:

• AbstractGS2DocumentRetrieve.java (modified) (2 diffs)
• AbstractMGPPSearch.java (modified) (2 diffs)
• GS2Browse.java (modified) (1 diff)
• GS2MGPPRetrieve.java (modified) (1 diff)
• GS2MGPPSearch.java (modified) (2 diffs)
• GS2MGRetrieve.java (modified) (1 diff)
• GS2MGSearch.java (modified) (1 diff)

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;
     }

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

@@ -91 +91 @@
     private static final int ADVANCED_QUERY = 2;
 
-    protected static final String INDEX_STEM_ELEM = "indexStem";
     protected static final String FIELD_ATT = "field";
     private MGPPWrapper mgpp_src=null;
@@ -135 +134 @@
     
     // the index stem is either specified in the config file or is "index"
-    Element index_stem_elem = (Element) GSXML.getChildByTagName(info, INDEX_STEM_ELEM);
+    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);

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

@@ -68 +68 @@
 
     System.err.println("Configuring GS2Browse...");
+    // 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);
+    String index_stem = null;
+    if (index_stem_elem != null) {
+        index_stem = index_stem_elem.getAttribute(GSXML.NAME_ATT);
+    }
+    if (index_stem == null || index_stem.equals("")) {
+        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, index_stem);
     if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
         System.err.println("GS2Browse Error: Could not open GDBM database!");

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

@@ -78 +78 @@
     // 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

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

@@ -37 +37 @@
 {
     protected GDBMWrapper gdbm_src = null;
+    protected String index_stem = null;
 
     /** constructor */
@@ -57 +58 @@
 
         // 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("Error: Could not open GDBM database!");

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

@@ -77 +77 @@
     // The location of the MG index and text files
     mg_basedir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar;  // Needed by MG
-    mg_textdir = GSFile.collectionTextPath(this.cluster_name);
+    mg_textdir = GSFile.collectionTextPath(this.index_stem);
     // index is only needed to start up MG, not used so just use the default index
-    String indexpath = GSFile.collectionIndexPath(this.cluster_name, this.default_index);
+    String indexpath = GSFile.collectionIndexPath(this.index_stem, this.default_index);
     this.mg_src.setIndex(indexpath);
 

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

@@ -56 +56 @@
 
         // 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("Error: Could not open GDBM database!");