Changeset 30542 for main/trunk

Timestamp:

2016-05-18T11:41:49+12:00 (8 years ago)

Author:

Georgiy Litvinov

Message:

Added checkFileExistence method for xslt checks. Fixed invisible group button in case badly configured group description.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (1 diff)
• web/interfaces/default/transform/gslib.xsl (modified) (2 diffs)
• web/sites/localsite/groupConfig.xml (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -554 +554 @@
         return new Locale(display_lang).getDisplayLanguage(new Locale(lang));
     }
+    
+    public static boolean checkFileExistence(String site_name, String filePath){
+
+        String gsdl3_home = GlobalProperties.getGSDL3Home();
+        //Remove leading file separator
+        filePath = filePath.replaceAll("^/+", "");
+        //Remove duplicates and replace by separator for current platform
+        filePath = filePath.replaceAll("/+", File.separator);
+        //Create full path to check
+        String fullPath = GSFile.siteHome(gsdl3_home, site_name) + File.separator + filePath;
+        File file = new File(fullPath);
+        if (file.exists() && file.isFile()) {
+            return true;
+        }
+        return false;
+    }
+    
     public static String uriEncode(String input)
     {

main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

@@ -204 +204 @@
     <xsl:variable name="desc"><xsl:value-of select="description"/></xsl:variable>
     <xsl:variable name="group_href"><xsl:value-of select="$library_name"/>?a=p&amp;sa=home&amp;group=<xsl:value-of select="/page/pageRequest/paramList/param[@name='group']/@value"/>/<xsl:value-of select="@name"/></xsl:variable>
+    
     <xsl:choose>
-      <xsl:when test="backgroundImage">
+      <xsl:when test="util:checkFileExistence($site_name, backgroundImage)">
         <a href="{$group_href}" title="{$desc}">
           <img class="groupLinkImage">
             <xsl:attribute name="alt"><xsl:value-of select="displayItem[@name='name']"/></xsl:attribute>
-            <xsl:attribute name="src">sites/<xsl:value-of select="$site_name"/>/images/<xsl:value-of select="backgroundImage"/></xsl:attribute>
+            <xsl:attribute name="src">sites/<xsl:value-of select="$site_name"/>/<xsl:value-of select="backgroundImage"/></xsl:attribute>
           </img>
         </a>
@@ -217 +218 @@
           <div class="groupLink ui-corner-all">
             <div class="groupLinkText ui-widget-content ui-corner-top">
-                <xsl:value-of select="title"/>
+                <xsl:choose>
+                    <xsl:when test="boolean(title)">
+                        <xsl:value-of select="title"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="@name"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </div>
             <div style="height:15px;" class="ui-state-default ui-corner-bottom"><xsl:text> </xsl:text></div>

main/trunk/greenstone3/web/sites/localsite/groupConfig.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!-- Collection groups configuration file
+        Uncomment hierarchy and groupDescription elements to make collection groups work.
+    Describe your structure inside hiearchy tag as shown in example below.
+    Describe your groups in groupDescriptions element as shown below.
+    Without group tag with @name in groupDescriptions group will be invisible(but available).
+    If your collection not described in hierarchy element it will be visible after described
+    groups and collections at home page.
+        First level - home page
+            Second level - inside first group
+                Third level - inside second group
+                    
+    -->
 <groupConfig>
-        
+    <!--
     <hierarchy>
-<!--    
         <group name="group2">
             <collection name="solr-jdbm-demo" />
-
         </group>
         <group name="group1">
-            
             <group name="group3">
                 <collection name="solr-jdbm-demo" />
@@ -16 +24 @@
                     <collection name="solr-jdbm-demo" />
                     <group name="group1">
-
                     </group>
                 </group>
             </group>
         </group>
-        <collection name="test-webeditor" />
---> 
+        <collection name="lucene-jdbm-demo" />
     </hierarchy>
     <groupDescriptions>
-<!--    
         <group name="group1">
-            <title>Group of collections</title>
-            <description>some description</description>
-            <shortDescription>Short description</shortDescription>
-            
         </group>
         <group name="group2">
-            <title>Group 2 of collections</title>
-            <description>second full description</description>
-            <shortDescription>second short description</shortDescription>
+            <title>Group 2 title</title>
+            <description>Second group full description example</description>
+            <shortDescription>Second group short description example</shortDescription>
             
         </group>
         <group name="group3">
-            <title>Group 3 of collections</title>
-            <description>3 full description</description>
-            <shortDescription>3 short description</shortDescription>
-            <backgroundImage>Group3.jpg</backgroundImage>
+            <title>Group 3 title</title>
+            <description>Group 3 full description example </description>
+            <shortDescription>Group 3 short description example</shortDescription>
+            <backgroundImage>/images/Group3.jpg</backgroundImage>
         </group>
---> 
     </groupDescriptions>
+    -->
 </groupConfig>