Changeset 24087 for main/trunk

Timestamp:

2011-05-25T20:10:55+12:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed Papitha's problem with GS3 not embedding thumbnails of image collections in links that take one to the source document. Katherine explained that we will need to modify the config_format.xsl in interfaces to have process a gsf:link for type=source. Dr Bainbridge found that we needed to make use of the httpPath variable to help us construct the URL path for the link and that we additionally needed to request the assocfilepath metadata in order to get all the meta needed to complete the URL, so now the GS3 java code requests assocfilemeta as well.

Location:

main/trunk/greenstone3

Files:

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

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

@@ -77 +77 @@
     }
 
-    protected void extractMetadataNames(Element format, HashSet meta_names) {
+    protected void extractMetadataNames(Element format, HashSet meta_names) {
     //NodeList nodes = format.getElementsByTagNameNS("metadata", "http://www.greenstone.org/configformat");
-    NodeList nodes = format.getElementsByTagName("gsf:metadata");
-        for (int i=0; i<nodes.getLength(); i++) {
-            Element elem = (Element)nodes.item(i);
+    NodeList metadata_nodes = format.getElementsByTagName("gsf:metadata");
+        for (int i=0; i<metadata_nodes.getLength(); i++) {
+            Element elem = (Element)metadata_nodes.item(i);
             StringBuffer metadata = new StringBuffer();
             String all = elem.getAttribute("multiple");
@@ -105 +105 @@
             meta_names.add(metadata.toString());
         }
+
+        // The XSL tranform for
+        //   gsf:link type="source" 
+        // makes use of 'assocfilepath' so need to make sure it's asked for
+
+        NodeList link_nodes = format.getElementsByTagName("gsf:link");
+            for (int i=0; i<link_nodes.getLength(); i++) {
+                Element elem = (Element)link_nodes.item(i);
+                String type = elem.getAttribute("type");
+            if (type.equals("source")) {
+            meta_names.add("assocfilepath");
+            }
+        }
+
     }
 

main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

@@ -36 +36 @@
     </a>
       </xsl:when>
+      <xsl:when test="@type='source'">
+    <a><xslt:attribute name='href'><xslt:value-of 
+       disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of 
+       disable-output-escaping="yes" select="metadataList/metadata[@name='assocfilepath']" />/<xslt:value-of 
+       disable-output-escaping="yes" select="metadataList/metadata[@name='Source']" /></xslt:attribute>
+      <xsl:apply-templates/>
+    </a>
+      </xsl:when>
+      
       <xsl:otherwise> <!-- a document link -->
     <xslt:variable name="bookswitch"><xslt:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/></xslt:variable>