Changeset 24981 for main

Timestamp:

2012-01-26T11:07:54+13:00 (12 years ago)

Author:

sjm84

Message:

In paged collections pages are leaf nodes rather than internal nodes which prevents calls like 'expand document' from working correctly. So for now I have added a (possibly) temporary fix

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java (modified) (4 diffs)

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

@@ -52 +52 @@
 public abstract class AbstractDocumentRetrieve extends ServiceRack
 {
-
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.AbstractDocumentRetrieve.class.getName());
 
@@ -442 +441 @@
         {
             Element doc = (Element) node_list.item(i);
+
             String doc_id = doc.getAttribute(GSXML.NODE_ID_ATT);
             String is_external = doc.getAttribute("externalURL");
@@ -493 +493 @@
                 if (want_info)
                 {
-
                     Element node_info_elem = this.doc.createElement("nodeStructureInfo");
                     doc.appendChild(node_info_elem);
@@ -766 +765 @@
             Element child_elem = createDocNode(child_id);
             doc.appendChild(child_elem);
-            if (recursive && !child_elem.getAttribute(GSXML.NODE_TYPE_ATT).equals(GSXML.NODE_TYPE_LEAF))
+            if (recursive && (!child_elem.getAttribute(GSXML.NODE_TYPE_ATT).equals(GSXML.NODE_TYPE_LEAF) || child_elem.getAttribute(GSXML.DOC_TYPE_ATT).equals(GSXML.DOC_TYPE_PAGED)))
             {
                 addDescendants(child_elem, child_id, recursive);