Changeset 30704

Timestamp:

2016-08-15T14:30:41+12:00 (8 years ago)

Author:

kjdon

Message:

use the top OID for marking doc in database - only top level ids are in there, not sections

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service

Files:

• DocumentMaker.java (modified) (3 diffs)
• GS2Construct.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java

@@ -44 +44 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.UserContext;
 import org.greenstone.gsdl3.util.XMLConverter;
@@ -451 +452 @@
                     _GSDM.documentXMLSetText(oid, collection, newContent, userContext);
                     
-                    markDocumentInFlatDatabase("R", collection, oid);
+                    // only top level doc ids are in database
+                    markDocumentInFlatDatabase("R", collection, OID.getTop(oid));
 
                 }
@@ -465 +467 @@
     }
     protected void markDocumentInFlatDatabase(String mark, String collection, String oid) {
-    
+      
         Document msg_doc = XMLConverter.newDOM();
         Element message = msg_doc.createElement(GSXML.MESSAGE_ELEM);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -38 +38 @@
 import org.greenstone.gsdl3.util.GSStatus;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
 import org.greenstone.gsdl3.util.UserContext;
@@ -739 +740 @@
             }
             
-            markDocumentInFlatDatabase("R", coll_name, oid);
+            markDocumentInFlatDatabase("R", coll_name, OID.getTop(oid));
             
             constructor.setQueryString(querystring.toString());