Changeset 26140

Timestamp:

2012-08-30T16:06:00+12:00 (12 years ago)

Author:

sjm84

Message:

Some more fixes to help the editor work with simple documents

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (2 diffs)
• web/interfaces/default/transform/pages/document.xsl (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -597 +597 @@
                 dummy_node.appendChild(this.doc.importNode(dc_response_doc_content, true));
                 // hack for simple type
-                if (document_type.equals("simple"))
+                if (document_type.equals(GSXML.DOC_TYPE_SIMPLE))
                 {
                     // we dont want the internal docNode, just want the content and metadata in the document
@@ -618 +618 @@
                     }
                 }
+                
+                the_document.setAttribute(GSXML.NODE_ID_ATT, modified_doc_id);
             }
             else

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -390 +390 @@
                                 <xsl:value-of select="$collName"/>
                                 <xsl:text>/document/</xsl:text>
-                                <xsl:value-of select="/page/pageResponse/document/documentNode/@nodeID"/>
+                                <xsl:choose>
+                                    <xsl:when test="count(//documentNode) > 0">
+                                        <xsl:value-of select="/page/pageResponse/document/documentNode/@nodeID"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:value-of select="/page/pageResponse/document/@nodeID"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
                                 <xsl:if test="not(/page/pageRequest/paramList/param[@name = 'docEdit']/@value = '1')">
-                                    <xsl:text>?ed=1&amp;docEdit=1</xsl:text>
+                                    <xsl:text>?ed=1&amp;docEdit=1&amp;dt=hierarchy</xsl:text>
                                 </xsl:if>
                             </xsl:attribute>