Changeset 15324


Ignore:
Timestamp:
05/01/08 13:54:37 (13 years ago)
Author:
kjdon
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java

    r14532 r15324  
    2828{
    2929
    30     protected GDBMWrapper gdbm_src = null;
     30    protected SimpleCollectionDatabase coll_db = null;
    3131   
    3232    // need to make it not add macros if they are already present
    33     public GS2MacroResolver(GDBMWrapper gdbm) {
     33    public GS2MacroResolver(SimpleCollectionDatabase db) {
    3434    super();
    35     gdbm_src = gdbm;
     35    coll_db = db;
    3636    }
    3737
     
    107107        if (match.matches()) {
    108108            if (node_info == null) {
    109             node_info = gdbm_src.getInfo(doc_oid);
     109            node_info = coll_db.getInfo(doc_oid);
    110110            if (node_info == null) {
    111111                break;
     
    116116            // try the root node
    117117            if (root_info == null && !OID.isTop(doc_oid)) {
    118                 root_info = gdbm_src.getInfo(OID.getTop(doc_oid));
     118                root_info = coll_db.getInfo(OID.getTop(doc_oid));
    119119            }
    120120            if (root_info == null) break;
Note: See TracChangeset for help on using the changeset viewer.