Changeset 38817 for main

Timestamp:

2024-03-03T20:31:57+13:00 (2 months ago)

Author:

anupama

Message:

I can't find a better way (the webswing way) to customise the applet parameters collection and library, no matter what I try. So I have made use of the fact that the docBaseURL of the applet that is available to the applet code contains both these pieces of information. Whether this will always be true when not using the default Greenstone DL URL structure, I'm not too sure. But for now, it is better than my previous commits where I hardcoded the library and, still worse, the collection name into the webswing config file to get the applet to show up with webswing. Better to leave the code in this improved state and maybe Kathy or Dr Bainbridge will know how it should actually be solved when configuring webswing options at JavaScript level (which had worked for GLI which didn't use appletParams but args/customArgs).

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/applet/phind/JPhind.java (modified) (2 diffs)
• web/interfaces/default/transform/pages/webswing-phind.xsl (modified) (3 diffs)

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

@@ -732 +732 @@
     // What is this collection called?
     collection = parameterValue("collection");
+
+    String docBase = getDocumentBase().toString();
+    int index = -1;
+    // Fallback for webswing, as customising applet param "collection" didn't work
+    // and the ideally-customisable collection and library applet params remain null
+    // This assumes webswing running the applet has a docBase URL of the form:
+    //docBase = "http://localhost:8383/greenstone3/library/collection/tudor/page/phind";
+    if(collection == null) {
+        //System.err.println("*** docBase: " + docBase);
+        index = docBase.indexOf("collection/");     
+        if(index != -1) {
+        index += "collection/".length();
+        int endIndex = docBase.indexOf("/", index);
+        collection = docBase.substring(index, endIndex);
+        //System.err.println("*** collection: " + docBase.substring(index, endIndex) );
+        }
+    }
+        
     System.out.println("Phind collection: " + collection);
 
@@ -740 +758 @@
     // Where is the Greenstone library
     library_address = parameterValue("library");
+    
+    // Fallback for webswing, as customising applet param "library" didn't work
+    if(library_address == null) {   
+        index = docBase.indexOf("/collection");
+        if(index != -1) {
+        String docBasePrefix = docBase.substring(0, index);
+        index = docBasePrefix.lastIndexOf("/");     
+        if(index != -1) {
+            
+            library_address = docBasePrefix.substring(index+1);
+            //System.err.println("*** library: " + docBasePrefix.substring(index+1) );
+        }
+        }
+    }   
     library_address = tidy_URL(library_address, true);
     System.out.println("Phind library: " + library_address);

main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-phind.xsl

@@ -99 +99 @@
 
       <gsf:script>
-
+        // https://www.webswing.org/docs/23.2/configure/applet.html
+        // https://www.webswing.org/docs/23.2/configure/swing.html
+        // https://www.webswing.org/docs/23.2/integrate/javascript-api?_h=customArgs%2Cargs#usage-with-customization-and-options        
+        // https://www.webswing.org/docs/23.2/integrate/embed.html
+        // https://www.webswing.org/docs/20.1/integrate/urlparams.html
+        // https://www.webswing.org/docs/23.2/integrate/urlparams.html
+        // https://www.webswing.org/docs/20.1/integrate/customize.html
+        // https://www.webswing.org/docs/2.7/integrate/embed.html
+        
     var webswingInstance0 = {
         options: {
-            autoStart: true,
-      
+        autoStart: true,
+    //appletParams: getParam('appletParams'),
+    //appletParams: {"collection":"tudor", "library":"library"},
             connectionUrl:'/webswing-server/phind',
 
         customization: function(injector) {
         injector.services.base.handleActionEvent = function(actionName, data, binaryData) {
-                console.log("WebSwing actionEvent callback handler: called with actionName = " + actionName);
-        /*
-        if (actionName == "previewURL") {
-              var url = data;
-              window.open(url, '_blank');
-        }
-            else if (actionName == "downloadURL") {
-          // currently the same as 'previewURL' but separate name gives this some future proofing
-              var url = data;
-              window.open(url, '_blank');
-        }
-            else if (actionName == "setCursor") {
-            var cursor_type = data;
-            $('#webswing-phind').css("cursor",cursor_type);         
-        }
-        else if (actionName == "javaToWebswingJSConsoleLog") {
-            console.log("Got message from java:\n" + data);
-        }
-        */
-        
+                console.log("WebSwing actionEvent callback handler: called with actionName = " + actionName);       
           }
             }
@@ -134 +124 @@
        }
        };
+       /*
        // Not yet working. Stick ${customArgs} at end of final param Value (BEFORE the value's closing double quote) in webswing.config.in
        // The applet jar files can just remain in web/applet where they are compiled up
-       /*if(!webswingInstance0.options.args) {
+       if(!webswingInstance0.options.args) {
        webswingInstance0.options.args="";
        }
@@ -144 +135 @@
        webswingInstance0.options.args += ", -Dwebswing.appletParam_library=";
        webswingInstance0.options.args+=(gs.xsltParams.library_name)?gs.xsltParams.library_name:"library";
+       
+       console.log("args: " +  webswingInstance0.options.args);
        */
+
+       /*       
+       if(!webswingInstance0.options.appletParams) {
+       webswingInstance0.options.appletParams={};
+       }       
+       if (gs.cgiParams.c) {       
+       webswingInstance0.options.appletParams["collection"] = gs.cgiParams.c;
+       }       
+       webswingInstance0.options.appletParams["library"] = (gs.xsltParams.library_name) ? gs.xsltParams.library_name : "library";
+       */
+       /*
+       if(!webswingInstance0.options.appletParams) {
+       webswingInstance0.options.appletParams="";
+       }
+       webswingInstance0.options.appletParams += "&amp;collection=tudor&amp;library=library";      
+       console.log("Custom Args: " + JSON.stringify(webswingInstance0.options.appletParams));
+       */
+       
     function getParam(name) {
         name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");