Changeset 38888

Timestamp:

2024-03-28T21:04:33+13:00 (4 weeks ago)

Author:

anupama

Message:

GsdlCollageApplet updates. 1. Removed the sitename parameter I had introduced, to just pass the official hrefMustHave parameter which builds up the necessary parameter using the sitename, instead of building up hrefMustHave in Java which would have hardcoded a customisable parameter. 2. Can now hide/show the status bar, which is now hidden by default since the GsdlCollageApplet never used the statusbar any way. 3. Moved a lot of the parameters out of webswing.config.in into the webswing-collage.xsl so that they are more easily customisable for the end user.

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) (6 diffs)
• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GsdlCollageBrowse.java (modified) (1 diff)
• main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-collage.xsl (modified) (1 diff)

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

@@ -159 +159 @@
       "launcherConfig" : {
         "mainClass" : "org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet",
-    "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\""
+    "args" : "${customArgs} --webswing 1 --gsdlversion 3 --isJava2 auto"
       },
       "homeDir" : "@gsdl3webwritablehomeunix@"

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

@@ -251 +251 @@
 
     // gets the parameters specified
+    String showStatusBar        = getParameter("statusbar");
+    if(showStatusBar == null || showStatusBar.equals("0")) {
+        System.err.println("### Hiding status bar (default)");
+        statusBar.setVisible(false);
+    }   
     String verbosity_param      = getParameter("verbosity");
     String is_java2_param       = getParameter("isJava2");
@@ -379 +384 @@
         // Try GS3 way
         String library = getParameter("library");
-        String site = getParameter("sitename");
+        //String site = getParameter("sitename");
         
         // starting URL (image_url) might not be base_url. We need to store base_url separately
@@ -406 +411 @@
         }
 
+        /*
         if(library != null && site != null && collection_param != null) {
             String gs3CollImgPath = library + "/sites/" + site + "/collect/" + collection_param;
@@ -417 +423 @@
             }
         }
+        */
         }
     }
@@ -605 +612 @@
 
     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("Params needed include: --gsdlversion <3/2> [--statusbar 0/1] [--baseurl <GS3 DL baseURL>/--gwcgi <library.cgi URL>] --library l --collection c --classifier cl --imageType \".jpg%.png\" --imageMustNotHave \"interfaces/\" [--hrefMustHave \"LIBRARYNAME/sites/SITENAME/collect/COLNAME\"] -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");
     }
@@ -612 +619 @@
     /**
      * After building the GS3 Multimedia collection, try running this Application as:
-java -cp ./web/applet/GsdlCollageApplet.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet --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"
+java -cp ./web/applet/GsdlCollageApplet.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet --statusbar 1 --baseurl "http://localhost:8383/greenstone3/" --library library --collection smallbea --gsdlversion 3 --hrefMustHave "library/sites/localsite/collect/smallbea" --documentroot greenstone3 --verbosity 3 --imageType ".jpg%.png" --imageMustNotHave "interfaces/" --classifier "CL2.3" --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor "#96c29a"
      */
     public static void main(String[] args) {

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

@@ -90 +90 @@
 
     String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='applet' CODE='org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class' ARCHIVE='GsdlCollageApplet.jar' WIDTH='600' HEIGHT='300'>"; // w=645,h=780
-    app_info +="<param name='library' value='library'/>"; // TODO
-    app_info +="<param name='collection'   value='";
-    app_info += this.cluster_name + "'/>";
+    app_info +="<param name='library' value='" + this.library_name + "'/>";
+    app_info +="<param name='collection'   value='" + this.cluster_name + "'/>";
     app_info += "<param name='gsdlversion' value='3' />";
     app_info += "<param name='baseurl' value='http://localhost:8383/greenstone3/' />";
-    app_info += "<param name='sitename' value='localsite' />\n";
-    
+    //app_info += "<param name='sitename' value='"+ this.site_home +"' />\n";
+    //app_info += "<param name='hrefMustHave' value='smallbea' />\n";
+    app_info += "<param name='hrefMustHave' value='" + this.library_name + "/sites/" + this.site_home + "/collect/" + this.cluster_name + "'/>\n";
     //app_info += "<param name='gwcgi' value='http://localhost:8383/greenstone3/library' /><param name='classifier' value='CL3.1' /><param name='hrefMustHave' value='CL3' /><param name='imageMustNotHave' value='hl=%x=%gt=%gc=%.pr' /><param name='imageType' value='.jpg%%.png' /><param name='maxDepth' value='500' /><param name='maxDisplay' value='25' /><param name='refreshDelay' value='1500' /><param name='isJava2' value='auto' /><param name='bgcolor' value='#96c29a' />The Collage Applet.</"+GSXML.APPLET_ELEM+">"; // TODO
 
     //app_info += "<param name='documentroot' value='library/collection/" + this.cluster_name + "/'/>";
-    app_info += "<param name='documentroot' value='greenstone3'/>\n";
+    app_info += "<param name='documentroot' value='greenstone3'/>\n"; // TODO
     app_info += "<param name='verbosity' value='3' />\n";
     app_info += "<param name='imageType' value='.jpg%.png' />\n";
-    //app_info += "<param name='hrefMustHave' value='smallbea' />\n";
     app_info += "<param name='imageMustNotHave' value='interfaces/' />\n";
     app_info += "<param name='classifier' value='CL2.3' /><param name='maxDepth' value='500' /><param name='maxDisplay' value='25' /><param name='refreshDelay' value='1500' /><param name='isJava2' value='auto' /><param name='bgcolor' value='#96c29a' />The Collage Applet.</"+GSXML.APPLET_ELEM+">"; // TODO

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

@@ -151 +151 @@
        baseURL = baseURL.substring(0, servlet_index+1);
        }
-       webswingInstance0.options.args += "--baseurl \"" + baseURL + "\"";       
+       var gs3CollImgPath = gs.xsltParams.library_name + "/sites/" + gs.xsltParams.site_name + "/collect/" + gs.cgiParams.c;
+
+       webswingInstance0.options.args += "--baseurl \"" + baseURL + "\"";
+       //webswingInstance0.options.args += " --gsdlversion 3";       
        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);
+       webswingInstance0.options.args += " --hrefMustHave " + gs3CollImgPath;
+       webswingInstance0.options.args += " --imageMustNotHave \"interfaces/\"";
+       webswingInstance0.options.args += " --verbosity " + 3;
+       webswingInstance0.options.args += " --imageType " + "\".jpg%.png\"";
+       webswingInstance0.options.args += " --classifier \"CL2.3\"";
+       webswingInstance0.options.args += " --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --bgcolor \"#96c29a\"";
+       
+       //console.log("args: " +  webswingInstance0.options.args);
     
     function getParam(name) {