Changeset 38796 for main/trunk

Timestamp:

2024-02-26T18:50:57+13:00 (3 months ago)

Author:

anupama

Message:

1. I've now got the new JPhind class, when run as an application, behaving the same way as the JPhind class behaves when run as an applet, by allowing more params to be passed in through the command line as key value pairs, and setting the test input xtraParams (new commandline arg to main) to be the same as hardcoded params in service/PhindPhraseBrowse. The difference is that the window is slightly bigger due to the addition of the status bar and lack of Applet menu, thus allowing more search results to be visible at the end. 2. Updated the class comment to use this example commandline way to launch the JPhind class as an application. 3. JPhind swing JApplet is now used in place of Phind awt Applet in service/PhindPhraseBrowse. I still need to carefully compare the Phind awt Applet with the JPhind swing JApplet to make sure JPhind really can replace Phind.

Location:

main/trunk/greenstone3/src/java/org/greenstone

Files:

• applet/phind/JPhind.java (modified) (4 diffs)
• gsdl3/service/PhindPhraseBrowse.java (modified) (1 diff)

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

@@ -33 +33 @@
 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"
+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?a=a&rt=d&s=PhindApplet&c=tudor" --collection tudor --classifier 1 --phindcgi "?a=a&rt=r&s=PhindApplet&o=xml&ro=1" --library "library" --backdrop "interfaces/default/images/phindbg1.jpg" --xtraParams "orientation=vertical&depth=2&resultorder=L,l,E,e,D,d&fontsize=10&blocksize=10"
+
+Basic version:
+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/gs2-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:
@@ -238 +241 @@
         if(i%2==1) {
         key = args[i].substring(2); // remove -- prefix of paramname
-        System.err.println("got key: " + key);
+        //System.err.println("got key: " + key);
         } else {
         value = args[i];
         appParams.put(key, value);
-        System.err.println("got value: " + value);
+        //System.err.println("got value: " + value);
+
+
+        // HttpUtils.parseQueryString() deprecated, so hacking decode xtra key-value pairs
+        // https://stackoverflow.com/questions/13592236/parse-a-uri-string-into-name-value-collection?page=1&tab=scoredesc#tab-top
+        // String.split() is preferred over Tokenizer but 2nd parameter behaves differently
+        // than I expected.
+        // https://docs.oracle.com/javase/6/docs/api/java/lang/String.html#split%28java.lang.String,%20int%29
+        if(key.equals("xtraParams")) {
+            value = value.replace("&", "&"); // just in case we have html entities
+            String[] param_list = value.split("&", 0); // 0 for all occurrences
+            for(String key_val : param_list) {          
+            String[] paramPair = key_val.split("=", 2); // get first 2 strings, key and val
+            //System.err.println("key_val: " + key_val);
+            if(paramPair.length == 2) {
+                String xtraParamsKey = paramPair[0];
+                String xtraParamsVal = paramPair[1];
+                //System.err.println("key - val: " + xtraParamsKey + " - " + xtraParamsVal);
+                appParams.put(xtraParamsKey, xtraParamsVal);
+            }
+            }
+        }
+        
         key = value = null;
         }
@@ -602 +627 @@
     public URL getDocumentBase() {
     if(!isRunAsApplet) { // launched as application
+        //System.err.println("*** docBaseURL: " + docBaseURL);
         return this.docBaseURL;
     } else {
@@ -1062 +1088 @@
     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>]");
+        System.err.println("Need minimum --params: <baseURL> --collection <collection> --classifier <classifier> --phindcgi <URL> --library <libURL> [--backdrop <ImgURL>] [--xtraParams <key1=value1&key2=value2&...]");
     }
     else { // collection fao.org, classifier 1, phindcgi url, library url, backdrop imgurl

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -102 +102 @@
     // this is left blank at this end, and must be filled in by applet action - if the library name is not needed, this param is left out
     // phindcgi param now is not complete - library must be prepended to it.
-    String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='applet' CODE='org.greenstone.applet.phind.Phind.class' ARCHIVE='phind.jar, xercesImpl.jar, xml-apis.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE=''/> <PARAM NAME='phindcgi' VALUE='?";
+    String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='applet' CODE='org.greenstone.applet.phind.JPhind.class' ARCHIVE='phind.jar, xercesImpl.jar, xml-apis.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE=''/> <PARAM NAME='phindcgi' VALUE='?";
     app_info += GSParams.ACTION +"=a&amp;"+GSParams.REQUEST_TYPE +"=r&amp;"+GSParams.SERVICE+"="+PHIND_SERVICE+"&amp;"+GSParams.OUTPUT+"=xml&amp;"+GSParams.RESPONSE_ONLY+"=1'/>";
     app_info +="<PARAM NAME='collection'   VALUE='";