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

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

@@ -23 +23 @@
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.GDBMWrapper;
 import org.greenstone.gsdl3.util.DBInfo;
 import org.greenstone.gsdl3.util.GSHTML;
@@ -109 +108 @@
         }
         
-        long doc_num = this.gdbm_src.OID2Docnum(doc_id);
-        if (doc_num == -1) {
+        String doc_num = this.coll_db.OID2Docnum(doc_id);
+        if (doc_num == null || doc_num.equals("")) {
         throw new Exception("OID "+doc_id +" couldn't be converted to lucene doc num");
         }
     
-        DBInfo info=this.gdbm_src.getInfo(OID.getTop(doc_id));
+        DBInfo info=this.coll_db.getInfo(OID.getTop(doc_id));
         if (info == null) {
-        throw new Exception("Couldn't get GDBM database entry for "+OID.getTop(doc_id));
+        throw new Exception("Couldn't get database entry for "+OID.getTop(doc_id));
         }
         
@@ -136 +135 @@
         current_section = full_document;
         } else {
-        current_section = GSXML.getNamedElement(full_document, SEC_LEVEL, ID_ATT, String.valueOf(doc_num));
+        current_section = GSXML.getNamedElement(full_document, SEC_LEVEL, ID_ATT, doc_num);
         }
         if (current_section == null) {