Changeset 38951

Timestamp:

2024-04-25T17:11:09+12:00 (5 hours ago)

Author:

anupama

Message:

Removing the temporary GS3 runtime Service class GsdlCollageBrowse.java and changes in buildConfigxml.pm and header.xsl needed to work with this that were added in order to get the GsdlCollageApplet to run in some manner and get some idea as to how it was to work/look. Since we've got it working the ideal way, these no longer used temporary changes are no longer necessary.

Location:

main/trunk

Files:

• greenstone2/perllib/buildConfigxml.pm (modified) (3 diffs)
• greenstone3/src/java/org/greenstone/gsdl3/service/GsdlCollageBrowse.java (deleted)
• greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (1 diff)

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -764 +764 @@
     my $count = 1;
     my $phind = 0;
-    my $collage = 0;
     my $started_classifiers = 0;
 
@@ -776 +775 @@
     #should add it into coll config classifiers
     next;
-      }
-      if ($classname =~ /^collage$/i) {
-    $collage=1;
-    #should add it into coll config classifiers 
       }
       
@@ -843 +838 @@
     &write_line('COLCFG', ["<serviceRack name=\"PhindPhraseBrowse\" />"]);
     }
-    # the collage classifier is a separate service
-    if ($collage) {
-    # if phind classifier
-    &write_line('COLCFG', ["<serviceRack name=\"GsdlCollageBrowse\" />"]);
-    }
+
     
     &write_line('COLCFG', ["</serviceRackList>"]);

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -433 +433 @@
     </xsl:for-each>
     
-    <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='GsdlCollageApplet']">
-      <li>
-        <xsl:choose>
-          <!-- If this tab is selected then colour it differently -->
-          <xsl:when test="/page/pageRequest[@action='a']">
-        <xsl:attribute name='class'>ui-state-default ui-corner-top ui-tabs-selected ui-state-active</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-        <xsl:attribute name='class'>ui-state-default ui-corner-top</xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-        
-        <a>
-          <xsl:if test="displayItem[@name='description']">
-        <xsl:attribute name="title">
-          <xsl:value-of select="displayItem[@name='description']"/>
-        </xsl:attribute>
-          </xsl:if>                       
-          <!--<xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=a&amp;rt=d&amp;s=<xsl:value-of select="@name"/>&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/></xsl:attribute>-->
-          <xsl:attribute name="href"><xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="/page/pageResponse/collection/@name"/>/page/collage</xsl:attribute>
-          <xsl:value-of select="displayItem[@name='name']"/>
-        </a>
-      </li>
-    </xsl:for-each>
-    
     <!-- all other services -->
-    <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[not(@type='query') and not(@type='browse') and not (@name='PhindApplet') and not (@name='GsdlCollageApplet')]">
+    <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[not(@type='query') and not(@type='browse') and not (@name='PhindApplet')]">
       <xsl:call-template name="navigationTab"/>
     </xsl:for-each>