Changeset 38929

Timestamp:

2024-04-16T16:38:29+12:00 (3 weeks ago)

Author:

anupama

Message:

Related to previous commit, but found I didn't need the previous value for hrefMustHave and so didn't have to append the new value to it but replace it. Adding the final changes into the applet parameters in classifier.xsl and GsdlCollageBrowse service (latter will probably get phased out eventually, it was just a programming aid). Previous commit 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)
• src/java/org/greenstone/gsdl3/service/GsdlCollageBrowse.java (modified) (3 diffs)
• web/interfaces/default/transform/pages/classifier.xsl (modified) (2 diffs)
• 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%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
+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/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/src/java/org/greenstone/gsdl3/service/GsdlCollageBrowse.java

@@ -89 +89 @@
     // 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
 
-    String siteName = this.site_home.substring(this.site_home.lastIndexOf("/sites/")+"/sites/".length());
+    //String siteName = this.site_home.substring(this.site_home.lastIndexOf("/sites/")+"/sites/".length());
     
     String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='applet' CODE='org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class' ARCHIVE='GsdlCollageApplet.jar, webswing-api.jar' WIDTH='600' HEIGHT='300'>"; // w=645,h=780
@@ -98 +98 @@
     //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/" + siteName + "/collect/" + this.cluster_name + "'/>\n";
+    //app_info += "<param name='hrefMustHave' value='" + this.library_name + "/sites/" + siteName + "/collect/" + this.cluster_name + "'/>\n";
+    app_info += "<param name='hrefMustHave' value='" + this.library_name + "/collection/" + this.cluster_name + "/browse/CL3'/>\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
 
@@ -106 +107 @@
     app_info += "<param name='imageType' value='.jpg%.png' />\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
+    app_info += "<param name='classifier' value='CL3.1' /><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
     
     Document dom = this.converter.getDOM(app_info);

main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl

@@ -174 +174 @@
       <param name='library' value='library'/>
       <param name="collection" value="smallbea"/> 
-      <param name="classifier" value="CL2.3"/> <!-- 3.1 -->
+      <param name="classifier" value="CL3.1"/>
 
       <param name='documentroot' value='greenstone3'/>
@@ -182 +182 @@
       <param name='verbosity' value='3' />
       <!--<param name="hrefMustHave" value="CL3"/>-->
-      <param name="hrefMustHave" value="library/sites/localsite/collect/smallbea"/>
+      <param name="hrefMustHave" value="library/collection/smallbea/browse/CL3"/>
       <param name='imageMustNotHave' value='interfaces/' />
       <param name="maxDepth" value="500"/>

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

@@ -156 +156 @@
        }
        var baseClassifier = "CL3";
-       var gs3CollImgPath = gs.xsltParams.library_name + "/sites/" + gs.xsltParams.site_name + "/collect/" + gs.cgiParams.c;
+       //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;
        
@@ -164 +164 @@
        webswingInstance0.options.args += " --library " + gs.xsltParams.library_name;
        webswingInstance0.options.args += " --documentroot greenstone3";
-       webswingInstance0.options.args += " --hrefMustHave " + gs3CollImgPath + "%" + gs3CollBrowsePath;
+       webswingInstance0.options.args += " --hrefMustHave " + gs3CollBrowsePath;
        webswingInstance0.options.args += " --imageMustNotHave \"interfaces/\"";
        webswingInstance0.options.args += " --verbosity " + 3;