Changeset 15324 for greenstone3

Timestamp:

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

Author:

kjdon

Message:

added support for JDBM (or other) in place of GDBM: use SimpleCollectionDatabase instead of GDBMWrapper

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java

@@ -28 +28 @@
 {
 
-    protected GDBMWrapper gdbm_src = null;
+    protected SimpleCollectionDatabase coll_db = null;
     
     // need to make it not add macros if they are already present
-    public GS2MacroResolver(GDBMWrapper gdbm) {
+    public GS2MacroResolver(SimpleCollectionDatabase db) {
     super();
-    gdbm_src = gdbm;
+    coll_db = db;
     }
 
@@ -107 +107 @@
         if (match.matches()) {
             if (node_info == null) {
-            node_info = gdbm_src.getInfo(doc_oid);
+            node_info = coll_db.getInfo(doc_oid);
             if (node_info == null) {
                 break;
@@ -116 +116 @@
             // try the root node
             if (root_info == null && !OID.isTop(doc_oid)) {
-                root_info = gdbm_src.getInfo(OID.getTop(doc_oid));
+                root_info = coll_db.getInfo(OID.getTop(doc_oid));
             }
             if (root_info == null) break;