Changeset 15787 for greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

Timestamp:

2008-05-29T13:29:54+12:00 (16 years ago)

Author:

oranfry

Message:

updating from trunk: brought in trunk changes from r15191 to r15785

File:

• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java (modified) (11 diffs)

greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

@@ -25 +25 @@
 import org.greenstone.gsdl3.util.MacroResolver;
 import org.greenstone.gsdl3.util.GS2MacroResolver;
-import org.greenstone.gsdl3.util.GDBMWrapper;
+import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
 import org.greenstone.gsdl3.util.DBInfo;
 // XML classes
@@ -52 +52 @@
      static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.GS2Browse.class.getName());
 
-    protected GDBMWrapper gdbm_src = null;
+    protected SimpleCollectionDatabase coll_db = null;
 
     public GS2Browse() 
     {
-    this.gdbm_src = new GDBMWrapper();
-    this.macro_resolver = new GS2MacroResolver(this.gdbm_src);
     }
 
     public void cleanUp() {
     super.cleanUp();
-    this.gdbm_src.closeDatabase();
+    this.coll_db.closeDatabase();
     }
 
@@ -82 +80 @@
     }
     
-    // Open GDBM database for querying
-    String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, index_stem);
-    if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        logger.error("Could not open GDBM database!");
+    // 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;
+    }
+    
+    // Open database for querying
+    String coll_db_file = GSFile.collectionDatabaseFile(this.site_home, this.cluster_name, index_stem, database_type);
+    if (!this.coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ)) {
+        logger.error("Could not open collection database!");
         return false;
     }
+    this.macro_resolver = new GS2MacroResolver(this.coll_db);
     return true;
     }
@@ -93 +107 @@
     /** if id ends in .fc, .pc etc, then translate it to the correct id */
     protected String translateId(String node_id) {
-    return this.gdbm_src.translateOID(node_id);
+    return this.coll_db.translateOID(node_id);
     }
 
@@ -103 +117 @@
     */
     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;
@@ -124 +138 @@
     // 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) {
@@ -144 +158 @@
     /** returns a list of the child ids in order, null if no children */
     protected ArrayList getChildrenIds(String node_id) {
-    DBInfo info = this.gdbm_src.getInfo(node_id);
+    DBInfo info = this.coll_db.getInfo(node_id);
     if (info == null) {
         return null;
@@ -170 +184 @@
 
     protected String getMetadata(String node_id, String key){
-    DBInfo info = this.gdbm_src.getInfo(node_id);
+    DBInfo info = this.coll_db.getInfo(node_id);
     if (info == null) {
         return "";
@@ -200 +214 @@
     String lang = "en";
     Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
-    DBInfo info = this.gdbm_src.getInfo(node_id);
+    DBInfo info = this.coll_db.getInfo(node_id);
     if (info == null) {
         return null;
@@ -251 +265 @@
         }
         
-        DBInfo info = this.gdbm_src.getInfo(parent_id);
+        DBInfo info = this.coll_db.getInfo(parent_id);
         if (info==null) {
         return "-1";
@@ -275 +289 @@
 
     protected int getNumChildren(String node_id) {
-    DBInfo info = this.gdbm_src.getInfo(node_id);
+    DBInfo info = this.coll_db.getInfo(node_id);
     if (info == null) {
         return 0;