Changeset 20817

Timestamp:

2009-10-14T15:58:44+13:00 (15 years ago)

Author:

kjdon

Message:

we no longer use sequential ids for sections. so can use doc_id to get the section.

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/GS2LuceneRetrieve.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/GS2LuceneRetrieve.java

@@ -47 +47 @@
     protected static final String DOC_LEVEL="Doc";
     protected static final String SEC_LEVEL="Sec";
-    protected static final String ID_ATT = "gs2:id";
+    protected static final String ID_ATT = "gs2:docOID";
 
     // Parameters used
@@ -102 +102 @@
      */
     protected Element getNodeContent(String doc_id, String lang) throws GSException {   
-    String doc_content = getTextString("TextRetrievalError", lang);
+      String [] args = new String[1];
+      args[0] = doc_id;
+      String doc_content = getTextString("TextRetrievalError", lang, args);
     try {
         if (!text_available) {
         throw new Exception("No text directory available");
         }
-        
-        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.coll_db.getInfo(OID.getTop(doc_id));
         if (info == null) {
@@ -135 +132 @@
         current_section = full_document;
         } else {
-        current_section = GSXML.getNamedElement(full_document, SEC_LEVEL, ID_ATT, doc_num);
+        current_section = GSXML.getNamedElement(full_document, SEC_LEVEL, ID_ATT, doc_id);
         }
         if (current_section == null) {
-        throw new Exception("Couldn't find section "+ doc_num+" in file "+doc_xml_file.getPath());
+        throw new Exception("Couldn't find section "+ doc_id+" in file "+doc_xml_file.getPath());
         }
         doc_content = GSXML.getNodeText(current_section);