Changeset 38928 for main/trunk

Timestamp:

2024-04-16T16:30:46+12:00 (7 weeks ago)

Author:

anupama

Message:

Setting up the Collage application parameters that will work with the 3.1 classifier (now that Dr Bainbridge fixed it up) from which image URLs will be discovered for the collage. hrefMustHave needed an addition for it to traverse the 3.1 tree down to 3(.1)*

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java (modified) (1 diff)
• web/interfaces/default/transform/pages/webswing-collage.xsl (modified) (2 diffs)

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

@@ -727 +727 @@
     /**
      * 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:./web/ext/webswing/api/webswing-api.jar org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet --statusbar 0 --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" --width 645 --height 780
+java -cp ./web/applet/GsdlCollageApplet.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes:./web/ext/webswing/api/webswing-api.jar org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet --statusbar 0 --baseurl "http://localhost:8383/greenstone3/" --library library --collection smallbea --gsdlversion 3 --hrefMustHave "library/sites/localsite/collect/smallbea%library/collection/smallbea/browse/CL3" --documentroot greenstone3 --verbosity 3 --imageType ".jpg%.png" --imageMustNotHave "interfaces/" --classifier "CL3.1" --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor "#96c29a" --width 645 --height 780
      */
     public static void main(String[] args) {

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

@@ -155 +155 @@
        baseURL = baseURL.substring(0, servlet_index+1);
        }
+       var baseClassifier = "CL3";
        var gs3CollImgPath = gs.xsltParams.library_name + "/sites/" + gs.xsltParams.site_name + "/collect/" + gs.cgiParams.c;
-
+       var gs3CollBrowsePath = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/browse/" + baseClassifier;
+       
        webswingInstance0.options.args += "--baseurl \"" + baseURL + "\"";
        //webswingInstance0.options.args += " --gsdlversion 3";       
@@ -162 +164 @@
        webswingInstance0.options.args += " --library " + gs.xsltParams.library_name;
        webswingInstance0.options.args += " --documentroot greenstone3";
-       webswingInstance0.options.args += " --hrefMustHave " + gs3CollImgPath;
+       webswingInstance0.options.args += " --hrefMustHave " + gs3CollImgPath + "%" + gs3CollBrowsePath;
        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 += " --classifier \"" + baseClassifier + ".1\""; // "CL3.1"
        webswingInstance0.options.args += " --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --bgcolor \"#96c29a\"";