Changeset 38887

Timestamp:

2024-03-28T00:47:50+13:00 (4 weeks ago)

Author:

anupama

Message:

Some of the variable and GS3-specific parameters have been moved out of webswing.config into the webswing-collage.xsl for customisation and for dynamically working out what they are. TODO: I think width and height of the app must also be passed in as parameters as it shouldn't be hardcoded in the applet when run as application. Probably the same fix is needed for the Phind applet too when run as application.

Files:

• gs3-extensions/webswing/trunk/web/etc/webswing.config.in (modified) (1 diff)
• main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java (modified) (1 diff)
• main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-collage.xsl (modified) (2 diffs)

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

@@ -159 +159 @@
       "launcherConfig" : {
         "mainClass" : "org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet",
-    "args" : "--webswing 1 --baseurl \"http://localhost:8383/greenstone3/\" --library library --collection smallbea --gsdlversion 3 --sitename localsite --documentroot greenstone3 --verbosity 3 --imageType \".jpg%.png\" --imageMustNotHave \"interfaces/\" --classifier \"CL2.3\" --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor \"#96c29a\""
-      },      
+    "args" : "${customArgs} --webswing 1 --gsdlversion 3 --verbosity 3 --imageType \".jpg%.png\" --imageMustNotHave \"interfaces/\" --classifier \"CL2.3\" --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor \"#96c29a\""
+      },
       "homeDir" : "@gsdl3webwritablehomeunix@"
     },

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java

@@ -606 +606 @@
     public static void printUsage() {
     System.err.println("Params needed include: --gsdlversion <3/2> [--baseurl <GS3 DL baseURL>/--gwcgi <library.cgi URL>] --library l --sitename s --collection c --classifier cl --imageType \".jpg%.png\" --imageMustNotHave \"interfaces/\" --documentroot greenstone3 [--webswing <1/0>] [--verbosity <v>] --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor \"#96c29a\" [--xtraParams <key1=value1&key2=value2&...]");
+    System.err.println("To run as webswing application, additionally pass in --webswing 1");
     }
     

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

@@ -139 +139 @@
        
        // The applet jar files can just remain in web/applet where they are compiled up
-/*       
+       
        if(!webswingInstance0.options.args) {
        webswingInstance0.options.args="";       
@@ -146 +146 @@
        //https://stackoverflow.com/questions/25203124/how-to-get-base-url-with-jquery-or-javascript
        var baseURL = window.location.origin+window.location.pathname;       
-       // webswingInstance0.options.args += "\"" + baseURL+ "?a=a&rt=d&s=PhindApplet&c="+gs.cgiParams.c + "\"";       
-       webswingInstance0.options.args += "\"" + baseURL + "\"";
-       
-       webswingInstance0.options.args += " --collection=" + gs.cgiParams.c;
-       webswingInstance0.options.args += " --library=" + gs.xsltParams.library_name;
-       
-       //console.log("args: " +  webswingInstance0.options.args);
-*/       
-       
-       /*
-       // 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) {
-       webswingInstance0.options.args="";
+       // webswingInstance0.options.args += "\"" + baseURL+ "?a=a&rt=d&s=GsdlCollageApplet&c=smallbea\"";
+       var servlet_index = baseURL.indexOf("/"+gs.xsltParams.library_name);
+       if(servlet_index > 0) {
+       baseURL = baseURL.substring(0, servlet_index+1);
        }
-       if (gs.cgiParams.c) {       
-       webswingInstance0.options.args += ", -Dwebswing.appletParam_collection=" + gs.cgiParams.c;
-       }
-       webswingInstance0.options.args += ", -Dwebswing.appletParam_library=";
-       webswingInstance0.options.args+=(gs.xsltParams.library_name)?gs.xsltParams.library_name:"library";
+       webswingInstance0.options.args += "--baseurl \"" + baseURL + "\"";       
+       webswingInstance0.options.args += " --collection " + gs.cgiParams.c;
+       webswingInstance0.options.args += " --library " + gs.xsltParams.library_name;
+       webswingInstance0.options.args += " --sitename " + gs.xsltParams.site_name;
+       webswingInstance0.options.args += " --documentroot greenstone3";
+//       webswingInstance0.options.args += " --gsdlversion 3";
+//       webswingInstance0.options.args += " --verbosity " + 3;
+//       webswingInstance0.options.args += " --imageType " + "\".jpg%.png\"";
+//       webswingInstance0.options.args += "--imageMustNotHave \"interfaces/\"";
+//       webswingInstance0.options.args += "--classifier \"CL2.3\"";
+       //webswingInstance0.options.args += "--maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor "#96c29a";
        
        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 += "&collection=tudor&library=library";      
-       console.log("Custom Args: " + JSON.stringify(webswingInstance0.options.appletParams));
-       */
-       
+    
     function getParam(name) {
         name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");