Changeset 38806

Timestamp:

2024-03-01T21:42:56+13:00 (3 months ago)

Author:

anupama

Message:

First attempt (2 *hardcoded* config params) of webswing version of Jphind JApplet. With hardcoding the library and collection in the webswing.config.in file, I can get the applet to work, so it tells me that if I can get every param right, the applet will appear. But without hardcoding these 2 params in the webswing.config.in file, and using the now commented-out code in the new webswing-phind.xsl to set the additional parameters, with further change of adding the customArgs property at the very end of the final parameter *value* (*before* end of this value's doublequote), I can get the tomcat/bin/logs/webswing.log to show me that all the custom parameters are as I want, and it attempts to launch the app, but then fails with errors indicating collection is null. So the collection parameter (and probably library param too) are not getting through after all. I was anyway not happy with how I had to add in the customArgs in the webswing.config for applet params nor how I had to set it in the webswing-phind.xsl file. I tried several alternate ways that I felt intuitively may or ought to work, but which didn't work at all, so I settled on the one version where the right values got through into the tomcat/bin/logs/webswing.log file, but even that ultimately ended up with a null collection as I just explained.

Files:

• gs3-extensions/webswing/trunk/build.xml (modified) (1 diff)
• gs3-extensions/webswing/trunk/web/etc/webswing.config.in (modified) (1 diff)
• main/trunk/greenstone3/build.xml (modified) (2 diffs)
• main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-phind.xsl (added)

gs3-extensions/webswing/trunk/build.xml

@@ -176 +176 @@
         <filter token="gsdl3srchome" value="${gsdl3srchome}"/>
         <filter token="gsdl3srchomeunix" value="${gsdl3srchome.unix}"/>
+        <filter token="gsdl3webwritablehome" value="${web.writablehome}"/>
+        <filter token="gsdl3webwritablehomeunix" value="${web.writablehome.unix}"/>
         <filter token="gsdlos" value="${gsdlos}"/>
         <filter token="internal-ws-webswingserver" value="${internal.ws-webswingserver}"/>

gs3-extensions/webswing/trunk/web/etc/webswing.config.in

@@ -73 +73 @@
     "webHomeDir" : "@gsdl3srchomeunix@/gli",
     "goodbyeUrl" : "/"
+  },
+  "/phind" : {
+    "path" : "/phind",
+    "security" : {
+      "module" : "NONE",
+      "config" : { },
+      "classPath" : [ ]
+    },
+
+    "webFolder" : "",
+    "swingConfig" : {
+      "jreExecutable" : "${java.home}/bin/java",
+      "javaVersion" : "${java.version}",
+      "vmArgs" : "",
+      "classPathEntries" : [ "applet/*.jar" ],
+      "theme" : "Murrine",
+      "fontConfig" : {
+        "dialog" : "${webswing.configDir}/fonts/Roboto-Regular.ttf",
+        "dialoginput" : "${webswing.configDir}/fonts/RobotoMono-Regular.ttf",
+        "monospaced" : "${webswing.configDir}/fonts/RobotoMono-Regular.ttf",
+        "serif" : "${webswing.configDir}/fonts/Roboto-Regular.ttf",
+        "sansserif" : "${webswing.configDir}/fonts/Roboto-Regular.ttf"
+      },
+      "swingSessionTimeout" : 300,
+      "antiAliasText" : true,
+      "isolatedFs" : true,
+      "debug" : false,
+      "directdraw" : true,
+      "allowDelete" : false,
+      "allowDownload" : false,
+      "allowAutoDownload" : true,
+      "allowUpload" : false,
+      "allowJsLink" : true,
+      "allowLocalClipboard" : true,
+      "launcherType" : "Applet",
+      "launcherConfig" : {
+        "appletClass" : "org.greenstone.applet.phind.JPhind",
+        "parameters" : {
+        "library" : "library",
+            "collection" : "tudor",
+        "phindcgi" : "?a=a&rt=r&s=PhindApplet&o=xml&ro=1",
+            "classifier" : "1",
+            "orientation" : "vertical",
+            "depth" : "2",
+            "resultorder" : "L,l,E,e,D,d",
+            "backdrop" : "interfaces/default/images/phindbg1.jpg",
+            "fontsize" : "10",
+            "blocksize" : "10"
+            }
+      },
+      "homeDir" : "@gsdl3webwritablehomeunix@"
+    },
+    "maxClients" : 4,
+    "maxConnections" : 4,
+    "allowStealSession" : false,
+    "name" : "Greenstone Librarian Interface",
+    "sessionMode" : "ALWAYS_NEW_SESSION",
+    "uploadMaxSize" : 1200,
+    "webHomeDir" : "@gsdl3webwritablehomeunix@",
+    "goodbyeUrl" : "/"
   }
 }

main/trunk/greenstone3/build.xml

@@ -3212 +3212 @@
     It seems to have a problem with cat or </dev/null, with or without the < sign. -->
   <target name="reset-logs" description="Empties catalina.out, solr.log, greenstone.log, usage.log, server.log and contents of web/logs/tmp">
-    <echo>Truncating catalina.out, solr.log, greenstone.log, usage.log and server.log, and emptying ${web.writablehome}/logs/tmp</echo>    
+    <echo>Truncating catalina.out, catalinahome/bin/logs/webswing.log, solr.log, greenstone.log, usage.log and server.log, and emptying ${web.writablehome}/logs/tmp</echo>    
     <exec executable="rm" os="${os.unix}" dir="${catalina.home}/logs" spawn="false">
       <arg value="-f"/>
       <arg value="catalina.out"/>
+    </exec>
+    <exec executable="rm" os="${os.unix}" dir="${catalina.home}/bin/logs" spawn="false">
+      <arg value="-f"/>
+      <arg value="webswing.log"/>
     </exec>
     <exec executable="rm" os="${os.unix}" dir="${web.writablehome}/logs" spawn="false">
@@ -3706 +3710 @@
     <copy file="${build.home}/GAI.jar" todir="${web.lib}"/>
     <copy file="${build.home}/GAI.jar" todir="${admin.dir}"/>
+
     <jar destfile="${build.home}/phind.jar">
       <fileset dir="${build.home}">