Changeset 38795 for main/trunk/greenstone3

Timestamp:

2024-02-26T17:44:36+13:00 (3 months ago)

Author:

anupama

Message:

1. Replacing class Phind with JPhind in service/PhindPhraseBrowser allows the JPhind JApplet (new swing phind applet) to work in the Java appletviewer after making the same correction to JApplet class JPhind.java as just committed for Applet class Phind.java: the change was to replace ampersand HTML entities with actual ampersands. 2. Launching the JPhind applet as an application largely works, if the xercesImpl and xml-apis jar files are added to the classpath. There are still differences: there's more information in the GUI when run as applet than as application, which I think has to do with the additional key-value params passed into the applet. I will test that next.

File:

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

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

@@ -31 +31 @@
 /*********************************************************************
 
-To run this applet as an application, for which this class has a main(), run as:
-
-java -cp ./web/WEB-INF/lib/gsdl3.jar:./web/WEB-INF/lib/gutil.jar:./web/applet/phind.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.phind.JPhind "http://localhost:8383/greenstone3/library" --collection tudor --classifier 1 --phindcgi "?a=a&rt=r&s=PhindApplet&o=xml&ro=1" --library "gs2-library" --backdrop "interfaces/default/images/phindbg1.jpg"
+To run this applet as an application, for which purpose this class has a main() method, run as:
+
+java -cp ./web/WEB-INF/lib/gsdl3.jar:./web/WEB-INF/lib/gutil.jar:./web/applet/phind.jar:./web/applet/xercesImpl.jar:./web/applet/xml-apis.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.phind.JPhind "http://localhost:8383/greenstone3/library" --collection tudor --classifier 1 --phindcgi "?a=a&rt=r&s=PhindApplet&o=xml&ro=1" --library "gs2-library" --backdrop "interfaces/default/images/phindbg1.jpg"
 
 To print very basic usage, run this as an application so:
@@ -128 +128 @@
     // set only if JPhind object is run as an application
     URL docBaseURL = null;
-    JTextField statusField = null;    
+    JLabel statusBar = null;    
     Map<String,String> appParams;
     
@@ -311 +311 @@
     // status bar that applet has, but we want one also if we run JPhind as application
     if(!isRunAsApplet) {
-        JPanel statusBar = new JPanel();
-        this.statusField = new JTextField();
-        statusBar.add(statusField);
+        statusBar = new JLabel();
         this.add(statusBar, BorderLayout.SOUTH);
     }
@@ -596 +594 @@
     public void showStatus(String msg) {
     if(!isRunAsApplet) {
-        this.statusField.setText(msg);
+        this.statusBar.setText(msg);
     } else {
         super.showStatus(msg);
@@ -712 +710 @@
     // we assume this is relative to the greenstone library
     phindcgi_address = parameterValue("library")+parameterValue("phindcgi");
+    phindcgi_address = phindcgi_address.replace("&amp;", "&");
     phindcgi_address = tidy_URL(phindcgi_address, true);
     System.out.println("Phind phindcgi: " + phindcgi_address);