Changeset 15326 for greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractGS2Search.java

Timestamp:

2008-05-01T13:59:09+12:00 (16 years ago)

Author:

kjdon

Message:

added support for JDBM (or other) in place of GDBM: use SimpleCollectionDatabase instead of GDBMWrapper. new Element in buildConfig file: databaseType, set to gdbm or jdbm. If not present, assume gdbm. Also may be some small style changes to some files

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractGS2Search.java (modified) (10 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractGS2Search.java

@@ -20 +20 @@
 
 // Greenstone classes
-import org.greenstone.mg.*;
-import org.greenstone.gsdl3.util.*;
+import org.greenstone.gsdl3.util.OID;
+import org.greenstone.gsdl3.util.DBInfo;
+import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
+import org.greenstone.gsdl3.util.GSFile;
 
 // XML classes
@@ -74 +77 @@
     protected int maxnumeric = 4;
 
-    protected GDBMWrapper gdbm_src = null;
-
-    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.GS2MGSearch.class.getName());
+    // collection database
+    protected SimpleCollectionDatabase coll_db = null;
+
+    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.AbstractGS2Search.class.getName());
 
 
@@ -82 +86 @@
     public AbstractGS2Search()
     {
-    this.gdbm_src = new GDBMWrapper();
+    
     }
     public void cleanUp() {
     super.cleanUp();
-    this.gdbm_src.closeDatabase();
+    this.coll_db.closeDatabase();
     }
 
@@ -93 +97 @@
     {
     if (!super.configure(info, extra_info)){
+        return false;
+    }
+
+    // find out what kind of database we have
+    Element database_type_elem = (Element) GSXML.getChildByTagName(info, GSXML.DATABASE_TYPE_ELEM);
+    String database_type = null;
+    if (database_type_elem != null) {
+      database_type = database_type_elem.getAttribute(GSXML.NAME_ATT);
+    }
+    if (database_type == null || database_type.equals("")) {
+      database_type = "gdbm"; // the default
+    }
+    coll_db = new SimpleCollectionDatabase(database_type);
+    if (coll_db == null) {
+      logger.error("Couldn't create the collection database of type "+database_type);
+      return false;
+    }
+    
+    // the index stem is either the collection name or is specified in the config file
+    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("")) {
+        logger.warn("indexStem element not found, stem will default to collection name");
+        this.index_stem = this.cluster_name;
+    }
+
+    // Open database for querying
+    String coll_db_file = GSFile.collectionDatabaseFile(this.site_home, this.cluster_name, this.index_stem, database_type);
+    if (!this.coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ)) {
+        logger.error("Could not open collection database!");
         return false;
     }
@@ -116 +152 @@
         this.default_index_language = defLang.getAttribute(GSXML.SHORTNAME_ATT);
     } //concate defaultIndex + defaultIndexSubcollection + defaultIndexLanguage
-     
-
-    // the index stem is either the collection name or is specified in the config file
-    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("")) {
-        logger.warn("indexStem element not found, stem will default to collection name");
-        this.index_stem = this.cluster_name;
-    }
-    
+        
     // get index options
     Element index_option_list = (Element) GSXML.getChildByTagName(info, GSXML.INDEX_OPTION_ELEM + GSXML.LIST_MODIFIER);
@@ -187 +212 @@
         } // for each index
     }
-        // Open GDBM database for querying
-    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)) {
-        logger.error(" Could not open GDBM database!");
-        return false;
-    }
     return true;
     }
@@ -294 +313 @@
     */
     protected String getDocType(String node_id){
-    DBInfo info = this.gdbm_src.getInfo(node_id);
+    DBInfo info = this.coll_db.getInfo(node_id);
     if (info == null) {
         return GSXML.DOC_TYPE_SIMPLE;
@@ -315 +334 @@
     // now we just check the top node
     if (!is_top) { // we need to look at the top info
-        info = this.gdbm_src.getInfo(top_id);
+        info = this.coll_db.getInfo(top_id);
     }
     if (info == null) {
@@ -331 +350 @@
     /** returns true if the node has child nodes */
     protected boolean hasChildren(String node_id){
-    DBInfo info = this.gdbm_src.getInfo(node_id);
+    DBInfo info = this.coll_db.getInfo(node_id);
     if (info == null) {
         return false;
@@ -351 +370 @@
     }
     
-   /** convert MG internal id to Greenstone oid */
+   /** convert indexer internal id to Greenstone oid */
     protected String internalNum2OID(long docnum)
     {
-    return this.gdbm_src.docnum2OID(docnum);
+    return this.coll_db.docnum2OID(docnum);
     
     }
     protected String internalNum2OID(String docnum)
     {
-    return this.gdbm_src.docnum2OID(docnum);
+    return this.coll_db.docnum2OID(docnum);
     
     }