Changeset 30540

Timestamp:

2016-05-16T14:24:50+12:00 (8 years ago)

Author:

Georgiy Litvinov

Message:

Added collection groups. Config file in web/sites/localsite/groupConfig.xml
PageAction now send request to CollectionGroups service to retrieve information about collections and groups.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (5 diffs)
• src/java/org/greenstone/gsdl3/service/CollectionGroups.java (added)
• src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (1 diff)
• src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (2 diffs)
• web/interfaces/default/style/core.css (modified) (2 diffs)
• web/interfaces/default/transform/gslib.xsl (modified) (1 diff)
• web/interfaces/default/transform/pages/home.xsl (modified) (3 diffs)
• web/sites/localsite/groupConfig.xml (added)
• web/sites/localsite/siteConfig.xml (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -26 +26 @@
 
     public Node process(Node message_node)
+    
     {
         Element message = GSXML.nodeToElement(message_node);
@@ -92 +93 @@
       Document doc = XMLConverter.newDOM();
         
+
         UserContext userContext = new UserContext(request);
         // first, get the message router info
         Element info_message = doc.createElement(GSXML.MESSAGE_ELEM);
-        Element coll_list_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
-        info_message.appendChild(coll_list_request);
+        Element info_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
+        //Create param list
+        Element param_list_element = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        info_request.appendChild(param_list_element);
+        //Describe params without collectionlist. Collectionlist provided by CollectionGroup service
+        GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.CLUSTER_ELEM + GSXML.LIST_MODIFIER);
+        GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
+        GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.SITE_ELEM + GSXML.LIST_MODIFIER);
+        GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        info_message.appendChild(info_request);
+        //Send request to message router
         Element info_response_message = (Element) this.mr.process(info_message);
+        //Check if it is not null
         if (info_response_message == null)
         {
@@ -103 +115 @@
             return null;
         }
+        //Check if it is not null
         Element info_response = (Element) GSXML.getChildByTagName(info_response_message, GSXML.RESPONSE_ELEM);
         if (info_response == null)
@@ -108 +121 @@
             logger.error("couldn't query the message router!");
             return null;
+        }
+        
+        Element resp_service_list = (Element) GSXML.getChildByTagName(info_response, GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
+        
+        if (resp_service_list == null) {
+            logger.error("No services available. Couldn't query the message router!");
+            return null;
+        }
+        Element groupInfoService = GSXML.getNamedElement(resp_service_list, GSXML.SERVICE_ELEM, GSXML.TYPE_ATT,
+                GSXML.SERVICE_TYPE_GROUPINFO);
+        if (groupInfoService != null) {
+            // Prepare request for CollectionGroup service to get current
+            // collections and groups list
+            Element group_info_message = doc.createElement(GSXML.MESSAGE_ELEM);
+            Element group_info_request = GSXML.createBasicRequest(doc, GSXML.TO_ATT,
+                    groupInfoService.getAttribute(GSXML.NAME_ATT), userContext);
+            group_info_message.appendChild(group_info_request);
+            //Append group request if exists
+            Element paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+            if (paramList != null) {
+                group_info_request.appendChild(doc.importNode(paramList, true));
+            }
+            Element group_info_response_message = (Element) this.mr.process(group_info_message);
+            Element group_info_response = (Element) GSXML.getChildByTagName(group_info_response_message,
+                    GSXML.RESPONSE_ELEM);
+            Element collection_list = (Element) GSXML.getChildByTagName(group_info_response,
+                    GSXML.COLLECTION_ELEM + GSXML.LIST_MODIFIER);
+            // Add Collection List from CollectionGroup Service to response
+            // from message router
+            info_response = (Element) doc.importNode(info_response, true);
+            if (collection_list != null) {
+                info_response.appendChild(doc.importNode(collection_list, true));
+            }
+            Element group_list = (Element) GSXML.getChildByTagName(group_info_response,
+                    GSXML.GROUP_ELEM + GSXML.LIST_MODIFIER);
+            if (group_list != null) {
+                info_response.appendChild(doc.importNode(group_list, true));
+            }
+            // Send message to groupInfoType Services
+        } else {
+            // If no service with type SERVICE_TYPE_GROUPINFO could be provided
+            // request message router for all available collections
+            GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM,
+                    GSXML.COLLECTION_ELEM + GSXML.LIST_MODIFIER);
+            info_response_message = (Element) this.mr.process(info_message);
+
+            if (info_response_message == null) {
+                logger.error(" couldn't query the message router!");
+                return null;
+            }
+            info_response = (Element) GSXML.getChildByTagName(info_response_message, GSXML.RESPONSE_ELEM);
+            if (info_response == null) {
+                logger.error("couldn't query the message router!");
+                return null;
+            }
         }
 
@@ -113 +181 @@
         // elements but for now, we'll just get it all
         Element collection_list = (Element) GSXML.getChildByTagName(info_response, GSXML.COLLECTION_ELEM + GSXML.LIST_MODIFIER);
-        logger.debug(GSXML.xmlNodeToString(collection_list));
+        //logger.debug(GSXML.xmlNodeToString(collection_list));
         if (collection_list != null)
         {

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

@@ -54 +54 @@
 
     }
+    
+    /** site config file path */
+    static public String groupConfigFile(String site_home)
+    {
+        return site_home + File.separatorChar + "groupConfig.xml";
+
+    }
+    
+    /** site images file path */
+    static public String imagesFilePath(String site_home)
+    {
+        return site_home + File.separatorChar + "images";
+
+    }
 
     /** interface config file path */

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

@@ -233 +233 @@
     public static final String SERVICE_TYPE_RETRIEVE = "retrieve";
     public static final String SERVICE_TYPE_BROWSE = "browse";
+    public static final String SERVICE_TYPE_GROUPINFO = "groupinfo";
     public static final String SERVICE_TYPE_APPLET = "applet";
     public static final String SERVICE_TYPE_PROCESS = "process";
@@ -306 +307 @@
     public static final String UTIL_NAMESPACE = "xalan://org.greenstone.gsdl3.util.XSLTUtil";
 
+    //Groups configuration
+    public static final String HIERARCHY_ELEM = "hierarchy";
+    public static final String GROUP_DESC_ELEM = "groupDescriptions";
+    public static final String TITLE_ELEM = "title";
+    public static final String DESCRIPTION_ELEM = "description";
+    public static final String SHORT_DESCRIPTION_ELEM = "shortDescription";
+    public static final String BACKGROUND_IMAGE_ELEM = "backgroundImage";
+    public static final String POSITION_ATT = "position";
+    
     /**
      * takes a list of elements, and returns an array of strings of the values

main/trunk/greenstone3/web/interfaces/default/style/core.css

@@ -286 +286 @@
 }
 
+#groupLinks a img{
+        display: block;
+        float: left;
+        border: 1px solid #888;
+        margin: 0 20px 20px 0;
+        font-size: 150%;
+        color: #444;
+        text-decoration: none;
+        height:60px;
+}
+
+.groupLink {
+    display: block;
+    float: left;
+    border: 1px solid #888;
+    margin: 0 20px 20px 0;
+    font-size: 150%;
+    color: #444;
+    text-decoration: none;
+    min-width: 200px;
+    text-align:center;
+}
 .collectionLink {
     display: block;
@@ -302 +324 @@
 }
 
+.groupLinkText {
+        padding: 15px 15px 10px;
+}
+
 /* some text should not be rendered as it is just there for search engines */
 #collectionLinks a b {
     display: none;
+}
+
+#groupLinks a b {
+        display: none;
 }
 

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

@@ -199 +199 @@
       </input>
     </form>
+  </xsl:template>
+  
+  <xsl:template name="groupLinkWithImage">
+    <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">
+        <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>
+          </img>
+        </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <a href="{$group_href}" title="{$desc}">
+          <div class="groupLink ui-corner-all">
+            <div class="groupLinkText ui-widget-content ui-corner-top">
+                <xsl:value-of select="title"/>
+            </div>
+            <div style="height:15px;" class="ui-state-default ui-corner-bottom"><xsl:text> </xsl:text></div>
+          </div>
+        </a>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
   

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

@@ -15 +15 @@
 
     <!-- set page breadcrumbs -->
-    <xsl:template name="breadcrumbs"></xsl:template>
+    <xsl:template name="breadcrumbs">
+        <xsl:if test="/page/pageRequest/paramList/param[@name='group']">
+            <gslib:siteLink/>
+        </xsl:if>
+    </xsl:template>
 
     <!-- the page content -->
@@ -26 +30 @@
         <h2><gslib:selectACollectionTextBar/></h2>
 
-        <xsl:call-template name="collectionLinks"/>
-
+        <xsl:for-each select="collectionList/collection|groupList/group">
+                    <xsl:sort select="@position"/>
+            <xsl:if test="name() = 'collection'">
+                                <gslib:collectionLinkWithImage/>
+            </xsl:if>
+            <xsl:if test="name() = 'group'">
+                                <gslib:groupLinkWithImage/>
+            </xsl:if>           
+                </xsl:for-each>
+    
             <div style="clear: both; padding-top: 4px; padding-bottom: 4px;"><hr/></div>
 
@@ -43 +55 @@
     </xsl:template>
 
+    <xsl:template name="groupLinks">
+        <div id="groupLinks">
+            <!-- <xsl:if test="count(groupList/group) = 0">
+                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home.no_collections')"/>
+                <br/>
+            </xsl:if>
+            -->
+            <xsl:for-each select="groupList/group">
+                <gslib:groupLinkWithImage/>
+            </xsl:for-each>
+            <br class="clear"/>
+        </div>
+    </xsl:template>
+    
     <xsl:template name="collectionLinks">
         <div id="collectionLinks">

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

@@ -12 +12 @@
         
         <serviceRack name="ArchiveIO"/>
+        <serviceRack name="CollectionGroups"/>
         <serviceRack name="DocumentMaker"/>
         <serviceRack name="DocXMLUtil"/>