Changeset 38927

Timestamp:

2024-04-16T15:30:51+12:00 (2 weeks ago)

Author:

anupama

Message:

Committing Dr Bainbridge's two fixes from yesterday: 1. The appletviewer can now at last find the applet folder containing the collage jar file to be run (and any helper jar files) and 2. He's fixed the XSL to load the built classifier information on the original collage classifier page (before webswing-collage.xsl was created) for the collage applet to use its classifier to traverse/discover what URLs need downloading. I've yet to merge this with corrected collage portion of classifier.xsl with webswing work to deal with only the final collage tab. Whether it will be an applet at that stage or needs to be an application (I've not got webswing to work with applet params passed in yet) is something that needs reinvestigating.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl (modified) (2 diffs)

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

@@ -155 +155 @@
      And made all param XML elements self-closing.
     -->
-    <!-- we seem to be in the web dir, so look in web/applet for the jar -->
-    <applet CODEBASE="applet"
+    <!-- When run in the browser or as an application, it's enough to specify applet as 
+     the relative folder for where to find the jars (we seem to be in the web dir then,
+     so can directly look in web's applet subdirectory for the jar). But for running with
+     this applet with the appletviewer we need the "full URL path" to the applet folder,
+     which is off /greenstone3. Though once the collage applet is run in the appletviewer,
+     a securityexception is thrown as appears it's in a sandbox and has no permission to
+     download URLs or follow external links or something.
+    -->
+    <applet codebase="/greenstone3/applet"
         code="org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class"
-        archive="GsdlCollageApplet.jar"
-        width="600" height="300"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        archive="GsdlCollageApplet.jar, webswing-api.jar"
+        width="600"
+        height="300">
       
       <param name='gsdlversion' value='3' />
@@ -304 +311 @@
       </xsl:when>
       <xsl:when test="@childType = 'Collage'">
-    <xsl:call-template name="Collage" />
+    <xsl:choose>
+      <xsl:when test="not(*)">
+        <xsl:call-template name="Collage" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select='classifierNode|documentNode' mode='process-all-children'>
+              <xsl:with-param name='collName' select='$collName' />
+              <xsl:with-param name='serviceName' select='$serviceName' />
+            </xsl:apply-templates>
+      </xsl:otherwise>
+    </xsl:choose>   
       </xsl:when>
       <xsl:otherwise>