Changeset 15787 for greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.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/AbstractGS2DocumentRetrieve.java (modified) (18 diffs)

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

@@ -27 +27 @@
 import org.greenstone.gsdl3.util.GS2MacroResolver;
 import org.greenstone.gsdl3.util.GSConstants;
-import org.greenstone.gsdl3.util.GDBMWrapper;
+import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
 import org.greenstone.gsdl3.util.DBInfo;
 // XML classes
@@ -59 +59 @@
     protected String index_stem = null;
 
-    protected GDBMWrapper gdbm_src = null;
+    protected SimpleCollectionDatabase coll_db = null;
 
 
@@ -65 +65 @@
     protected AbstractGS2DocumentRetrieve()
     {
-    this.gdbm_src = new GDBMWrapper();
-    this.macro_resolver = new GS2MacroResolver(this.gdbm_src);
+    this.macro_resolver = new GS2MacroResolver();
     }
 
     public void cleanUp() {
-    super.cleanUp();
-    this.gdbm_src.closeDatabase();
+        super.cleanUp();
+        this.coll_db.closeDatabase();
     }
     /** configure this service */
@@ -93 +92 @@
     }
 
-    // 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!");
+    // 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, this.index_stem, database_type);
+    if (!this.coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ)) {
+        logger.error("Could not open collection database!");
         return false;
     }
+
+    // we need to set the database for our GS2 macro resolver
+    GS2MacroResolver gs2_macro_resolver = (GS2MacroResolver)this.macro_resolver;
+    gs2_macro_resolver.setDB(this.coll_db);
 
     return true;
@@ -105 +123 @@
     /** 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);
     }
     
@@ -111 +129 @@
     it to a greenstone one*/
     protected String translateExternalId(String node_id){
-    return this.gdbm_src.externalId2OID(node_id);
+    return this.coll_db.externalId2OID(node_id);
     }
 
@@ -120 +138 @@
     /** 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;
@@ -156 +174 @@
     throws GSException {
     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;
@@ -211 +229 @@
         }
         
-        DBInfo info = this.gdbm_src.getInfo(parent_id);
+        DBInfo info = this.coll_db.getInfo(parent_id);
         if (info==null) {
         return "-1";
@@ -235 +253 @@
 
     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;
@@ -254 +272 @@
     */
     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;
@@ -275 +293 @@
     // 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) {
@@ -337 +355 @@
     
     // now check for relational info
-    if (temp.equals("parent") || temp.equals("root") || temp.equals( "ancestors")) { // "current" "siblings" "children" "descendents"
+    if (temp.equals("parent") || temp.equals("root") || temp.equals( "ancestors")) { // "current" "siblings" "children" "descendants"
         relation = temp;
         pos = metadata.indexOf(GSConstants.META_RELATION_SEP);
@@ -370 +388 @@
         relation_info = info;
     } else {
-        relation_info = this.gdbm_src.getInfo(relation_id);
+        relation_info = this.coll_db.getInfo(relation_id);
     }
     if (relation_info == null) {
@@ -405 +423 @@
     relation_id = OID.getParent(current_id);
     while (!relation_id.equals(current_id)) {
-        relation_info = this.gdbm_src.getInfo(relation_id);
+        relation_info = this.coll_db.getInfo(relation_id);
         if (relation_info == null) return result.toString();
         if (!multiple) {
@@ -427 +445 @@
     
 
-    /** needs to get info from gdbm database - if the calling code gets it already it may pay to pass it in instead */
+    /** needs to get info from collection database - if the calling code gets it already it may pay to pass it in instead */
     protected String resolveTextMacros(String doc_content, String doc_id, String lang)
     {
@@ -452 +470 @@
         value="-1";
         } else {
-        DBInfo info = this.gdbm_src.getInfo(parent_id);
+        DBInfo info = this.coll_db.getInfo(parent_id);
         if (info==null) {
             value ="-1";
@@ -478 +496 @@
 
     protected String getHrefOID(String href_url){
-        return this.gdbm_src.docnum2OID(href_url);
+        return this.coll_db.docnum2OID(href_url);
     }