Changeset 38854 for main/trunk/greenstone3/web/interfaces/default

Timestamp:

2024-03-20T22:31:51+13:00 (2 months ago)

Author:

anupama

Message:

Having been able to look at the GS2.88 Collage applet at least trying to run through the appletviewer somewhat (it doesn't really do much than say it's downloading and print out some file information to the terminal), I wanted at least that much to work with the Collage Applet in GS3. Just to get the appletviewer to display a somewhat working GS3 Collage applet (previously it would fail before applet initialisation, with a hard to fathom magic number Java error), I had to create a very skeletal GsdlCollageBrowse.java service, the way Phind has a (proper, non-skeletal) PhindPhraseBrowse service. I'm not sure if this service need or should do more for Collage, as I think the Collage applet rather than the service should take care of all the inner workings. I also needed the perl code to write out the new collage service to the buildconfig.xml file for this to actually appear. So far, the applet params are all hardcoded. I still need to investigate what the Collage applet is trying to do, such as how it works out which files to download and tries to download them, as for GS3 it's not even listing the files to download.

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• layouts/header.xsl (modified) (1 diff)
• pages/applet.xsl (modified) (1 diff)
• pages/classifier.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -433 +433 @@
     </xsl:for-each>
     
+    <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='GsdlCollageApplet']">
+      <li>
+        <xsl:choose>
+          <!-- If this tab is selected then colour it differently -->
+          <xsl:when test="/page/pageRequest[@action='a']">
+        <xsl:attribute name='class'>ui-state-default ui-corner-top ui-tabs-selected ui-state-active</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+        <xsl:attribute name='class'>ui-state-default ui-corner-top</xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        
+        <a>
+          <xsl:if test="displayItem[@name='description']">
+        <xsl:attribute name="title">
+          <xsl:value-of select="displayItem[@name='description']"/>
+        </xsl:attribute>
+          </xsl:if>                       
+          <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=a&amp;rt=d&amp;s=<xsl:value-of select="@name"/>&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/></xsl:attribute>
+          <!--<xsl:attribute name="href"><xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="/page/pageResponse/collection/@name"/>/page/collage</xsl:attribute>-->
+          <xsl:value-of select="displayItem[@name='name']"/>
+        </a>
+      </li>
+    </xsl:for-each>
+    
     <!-- all other services -->
-    <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[not(@type='query') and not(@type='browse') and not (@name='PhindApplet')]">
+    <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[not(@type='query') and not(@type='browse') and not (@name='PhindApplet') and not (@name='GsdlCollageApplet')]">
       <xsl:call-template name="navigationTab"/>
     </xsl:for-each>

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

@@ -12 +12 @@
 
     <!-- set page title -->
-    <xsl:template name="pageTitle">The Phind Applet<!--<gslib:collectionName/><xsl:value-of select="/page/pageResponse/service/applet"/>--></xsl:template>
+    <xsl:template name="pageTitle">Applet: <!--The Phind Applet--><gslib:collectionName/><xsl:value-of select="/page/pageResponse/service/applet"/></xsl:template>
 
     <!-- set page breadcrumbs -->

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

@@ -152 +152 @@
     <!-- Copied from GS2.88's about.dm (document.dm has a more applet params).
 
-     Modified params: codebase, GsdlCollageApplet class' package, gwcgi, collection, classifier, hrefMustHave. Param isJava2's value changed from auto to true.
+     Modified params: codebase, GsdlCollageApplet class' package, gwcgi, collection, classifier value="CL2.3", hrefMustHave value="cl=CL3.1". Param isJava2's value changed from auto to true.
      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" code="org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class" 
-         archive="GsdlCollageApplet.jar" width="445" height="250">
+    <applet CODEBASE="applet"
+        code="org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class"
+        archive="GsdlCollageApplet.jar"
+        width="445" height="250">
  
      <param name="gwcgi" value="http://localhost:8383/greenstone3/library"/>
          <param name="collection" value="smallbea"/> 
-         <param name="classifier" value="CL2.3"/>
+         <param name="classifier" value="CL3.1"/>
        
-         <param name="hrefMustHave" value="smallbea"/>
+         <param name="hrefMustHave" value="CL3"/>
          <param name="imageMustNotHave" value="hl=%x=%gt=%gc=%.pr"/>
 
+     <!--
      <param name="imageType" value=".jpg%.png"/>  
      <param name="verbosity" value="5"/>
@@ -171 +174 @@
      <param name="refreshDelay" value="1500"/>
      <param name="isJava2" value="true"/>
-
+     -->
+     <param name="imageType" value=".jpg%%.png"/>  
+     <param name="maxDepth" value="500"/>
+     <param name="maxDisplay" value="25"/>
+     <param name="refreshDelay" value="1500"/>
+     <param name="isJava2" value="auto"/>
+     <param name="bgcolor" value="#96c29a"/>
+     <!--<param name="documentroot" value="/greenstone/web/images"/> for GS2-->
    </applet>
   </xsl:template>