Changeset 15324 for greenstone3/trunk/src/java/org/greenstone
- Timestamp:
- 2008-05-01T13:54:37+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java
r14532 r15324 28 28 { 29 29 30 protected GDBMWrapper gdbm_src= null;30 protected SimpleCollectionDatabase coll_db = null; 31 31 32 32 // need to make it not add macros if they are already present 33 public GS2MacroResolver( GDBMWrapper gdbm) {33 public GS2MacroResolver(SimpleCollectionDatabase db) { 34 34 super(); 35 gdbm_src = gdbm;35 coll_db = db; 36 36 } 37 37 … … 107 107 if (match.matches()) { 108 108 if (node_info == null) { 109 node_info = gdbm_src.getInfo(doc_oid);109 node_info = coll_db.getInfo(doc_oid); 110 110 if (node_info == null) { 111 111 break; … … 116 116 // try the root node 117 117 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)); 119 119 } 120 120 if (root_info == null) break;
Note:
See TracChangeset
for help on using the changeset viewer.