Changeset 38848 for main/trunk/greenstone3/src

Timestamp:

2024-03-18T20:37:34+13:00 (2 months ago)

Author:

anupama

Message:

1. Running webswing-phind as an application instead of as an applet, so we can finally pass in the variable collection and library parameters. This required altering webswing.config.in (to launch JPhind as application instead of applet) and webswing-phind.xsl (to pass in the additional parameters). 2. When run as applet, clicking leaf nodes in the search results list opened the clicked url result in a browser window/tab but this wasn't happening when run as application. The easiest solution was to handle it when JPhind is run as a webswing application: in that case, it just requires registering a new eventhandler called openURL in the webswing-phind.xsl's JavaScript code, then calling this from the Java code. In JPhind.java, we now pass in a webswing command line parameter set to 1 to indicate JPhind is run as by webswing and as an application. (The webswing cmdline arg will default to 0 if not set, such as for applets or if run from the commandline without being set.) If run as an applet, JPhind uses the inherited AppletContext object as before to open a URL in the browser where the applet is being run. But now, if run as a webswing Application, it calls the new webswing custom eventhandler called openURL (for which JPhind needs to be compiled against the webswing-api.jar now) and passes the URL and any target window where the URL is to be opened. Finally, webswing.config.in passes in the new webswing parameter set to 1, since we're running the phind webswing as an application and also needs the webswing-api.jar in its classpath for phind.

File:

• main/trunk/greenstone3/src/java/org/greenstone/applet/phind/JPhind.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/applet/phind/JPhind.java

@@ -92 +92 @@
 package org.greenstone.applet.phind;
 
+import org.webswing.toolkit.api.WebswingUtil;
+
 import javax.swing.JApplet;
 import javax.swing.JComponent;
@@ -136 +138 @@
     implements ActionListener {
 
+    boolean isWebswingApplication = false; // if run as webswing *and* application (not applet)
+    
     boolean isRunAsApplet = true;
     // set only if JPhind object is run as an application
@@ -215 +219 @@
     // 1. The search button is easy to disable, and is disabled when a
     //    socket connection is in progress.
-    // 2. ResutCanvas widgets can'r be similarly disabled because the
+    // 2. ResutCanvas widgets can't be similarly disabled because the
     //    browser hides or wipes them, which looks very bad.
     // 3. I cannot just ignore clicks on canvasses because the browser
@@ -280 +284 @@
     }
 
+    isWebswingApplication = appParams.getOrDefault("webswing", "0").equals("1") ? true : false;
+    
     // manually calling (J)Applet method init()
     init();
@@ -716 +722 @@
     try { 
         URL url= new URL(address);
-        if (window.length() > 0) {
-        getAppletContext().showDocument(url, window);
-        } else {
-        getAppletContext().showDocument(url);
+        if(isRunAsApplet) {
+        if (window.length() > 0) {
+            getAppletContext().showDocument(url, window);
+        } else {
+            getAppletContext().showDocument(url);
+        }
+        } else if(isWebswingApplication) {
+        if (window.length() > 0) {
+            WebswingUtil.getWebswingApi().sendActionEvent("openURL",
+                                  url.toString() + " - " +window,
+                                  null);
+        } else {
+            WebswingUtil.getWebswingApi().sendActionEvent("openURL", url.toString(), null);
+        }
+        } else { // else application, but not webswing, TODO: open browser at the URL
+        System.err.println("Phind.displayWebPage() for non-applet and non-webswing application is not yet implemented.");
         }
     } catch (Exception e) { 
@@ -1130 +1148 @@
     public static void main(String args[]) {
     if(args.length < 9) {
-        System.err.println("Need minimum --params: <baseURL> --collection <collection> --classifier <classifier> --phindcgi <URL> --library <libURL> [--backdrop <ImgURL>] [--xtraParams <key1=value1&key2=value2&...]");
+        System.err.println("Need minimum --params: <baseURL> --collection <collection> --classifier <classifier> --phindcgi <URL> --library <libURL> [--webswing <1/0>] [--backdrop <ImgURL>] [--xtraParams <key1=value1&key2=value2&...]");
     }
     else { // collection fao.org, classifier 1, phindcgi url, library url, backdrop imgurl