Changeset 38853

Timestamp:

2024-03-19T21:45:02+13:00 (6 weeks ago)

Author:

anupama

Message:

Copied the GsdlCollageApplet package from GS2 into GS3's src/java/org/greenstone/applet folder and adjusted the package names in the classes accordingly. Also made GsdlCollageApplet into a JApplet (no actual awt GUI classes appear to be used, so this was easy). Added compile code into build.xml and there are still deprecated warnings I want to iron out, but only after I can see it working in the appletviewer where things are still not working. Also adjusted classifier.xsl in interfaces/default to move the JavaScript collage work out of the way and instead push out the old applet code with values hardcoded to what I imagine they must be. But as I said, I can't get the appletviewer to display the applet yet. Running the appletviewer on the small beatles collection's Collage classifier page, throws up an error in the terminal: java.lang.ClassFormatError: Incompatible magic value 1008813135 in class file org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet. It is unclear yet what is causing this error.

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (1 diff)
• src/java/org/greenstone/applet/GsdlCollageApplet (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/CURL.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/CollageImage.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/Display.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/DisplayImages.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/DownloadImages.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/DownloadUrls.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java (added)
• src/java/org/greenstone/applet/GsdlCollageApplet/MyAffineTransform.java (added)
• web/interfaces/default/transform/pages/classifier.xsl (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -3724 +3724 @@
     <copy file="${build.home}/phind.jar" todir="${web.applet}"/>
     <!-- phind also needs xercesImpl.jar and xml-apis.jar to be in web/applet -->
-    <if>
+
+    <jar destfile="${build.home}/GsdlCollageApplet.jar">
+      <fileset dir="${build.home}">
+        <include name="org/greenstone/applet/GsdlCollageApplet/**"/>
+      </fileset>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}" />
+      </manifest>
+    </jar>
+    <mkdir dir="${web.applet}"/>
+    <copy file="${build.home}/GsdlCollageApplet.jar" todir="${web.applet}"/>
+    <!-- TODO: Does GsdlCollageApplet (like phind) also needs xercesImpl.jar and xml-apis.jar to be in web/applet??? -->
+
+   <if>
       <bool><istrue value="${tomcat.islocal}"/></bool>
       <if><bool><available file="${catalina.home}/lib/xercesImpl.jar"/></bool><!-- moved for solr -->

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

@@ -148 +148 @@
 
   <xsl:template name="Collage">
+
+    TODO: Here is the collage applet
+    <!-- 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.
+     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">
+ 
+     <param name="gwcgi" value="http://localhost:8383/greenstone3/library"/>
+         <param name="collection" value="smallbea"/> 
+         <param name="classifier" value="CL2.3"/>
+       
+         <param name="hrefMustHave" value="smallbea"/>
+         <param name="imageMustNotHave" value="hl=%x=%gt=%gc=%.pr"/>
+
+     <param name="imageType" value=".jpg%.png"/>  
+     <param name="verbosity" value="5"/>
+     <param name="maxDepth" value="3"/>
+     <param name="refreshDelay" value="1500"/>
+     <param name="isJava2" value="true"/>
+
+   </applet>
+  </xsl:template>
+  
+  <xsl:template name="Collage_javascript_deprecated">
     <script type="text/javascript" src="interfaces/{$interface_name}/js/collage_scripts.js"><xsl:text> </xsl:text></script>
         <div id="collagewrapper" style="width: 800px; height: 643px; position: relative; background-image:url('sites/{$site_name}/collect/twso/images/oldimagebackground1.png'); text-align: center;" alt="Click to start/stop a collage of images" title="Click to start/stop a collage of images" onmouseover="" onmouseout=""><xsl:text> </xsl:text></div>