Changeset 38921 for main/trunk

Timestamp:

2024-04-09T19:31:39+12:00 (2 months ago)

Author:

anupama

Message:

Minor correction to GS3 service and bringing unused (still not working) part of classifier.xsl up to speed.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/service/GsdlCollageBrowse.java (modified) (2 diffs)
• web/interfaces/default/transform/pages/classifier.xsl (modified) (2 diffs)

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 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='" + this.library_name + "'/>";
@@ -96 +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/" + this.site_home + "/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='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
 

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

@@ -159 +159 @@
         code="org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class"
         archive="GsdlCollageApplet.jar"
-        width="600" height="300">
+        width="600" height="300"
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       
       <param name='gsdlversion' value='3' />
       <param name='baseurl' value='http://localhost:8383/greenstone3/' />
-      <param name='sitename' value='localsite' />      
+      <!--<param name='sitename' value='localsite' />-->
       <param name='library' value='library'/>
       <param name="collection" value="smallbea"/> 
@@ -174 +175 @@
       <param name='verbosity' value='3' />
       <!--<param name="hrefMustHave" value="CL3"/>-->
+      <param name="hrefMustHave" value="library/sites/localsite/collect/smallbea"/>
       <param name='imageMustNotHave' value='interfaces/' />
       <param name="maxDepth" value="500"/>