Changeset 8439 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGRetrieve.java

Timestamp:

2004-11-03T14:46:37+13:00 (20 years ago)

Author:

kjdon

Message:

when creating doc nodes, now we choose hierarchy or simple based on whether there is a section structure in the database. we used to always change doc ids that matched the whole structure to be the first section id, eg 20041102:1 to 20041102:1-1. this is now only done for hierarchical docs, not for simple docs.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGRetrieve.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGRetrieve.java

@@ -164 +164 @@
         //ystem.out.println("translated id = "+doc_id);
         }
-        if (GS3OID.isDocTop(doc_id)) {
-        System.out.println("adding the structure bit to doc id");
-        doc_id = GS3OID.createOID(doc_id, "1");
+        if (GS3OID.isDocTop(doc_id) && database.isHierarchicalDocument(doc_id)) {
+        // if we have a whole doc id, and the document is hierarchical,
+        // we want to change the id to be the top id of the section 
+        // hierarchy
+            doc_id = GS3OID.createOID(doc_id, "1");
         }
-        String doc_num = this.database.OID2MGNum(doc_id);
-        
-        //long doc_num = this.gdbm_src.oid2Docnum(doc_id);
-        System.out.println("mg doc num = "+doc_num);
+        String doc_num = this.database.OID2MGNum(doc_id);       
         // doc nums have the index prefixed 
         doc_num = doc_num.substring(doc_num.indexOf(".")+1);
         int doc_int = Integer.parseInt(doc_num);
-        System.out.println("actual mg doc num="+doc_int);
+        
         String doc_content = "";
         try {
-          doc_content = this.mg_src.getDocument(basedir, textdir, doc_int);
+        doc_content = this.mg_src.getDocument(basedir, textdir, doc_int);
         } catch (Exception e) {
-          System.out.println("exception happended with mg_src.getDocument()");
-          doc_content = "this is the content for section hash id "+ doc_id+", mg doc num "+doc_int+"\n";
+        System.out.println("exception happended with mg_src.getDocument()");
+        doc_content = "this is the content for section hash id "+ doc_id+", mg doc num "+doc_int+"\n";
         }
         //ystem.out.println("Doc content: " + doc_content + "|");