Changeset 27087

Timestamp:

2013-03-14T17:23:20+13:00 (11 years ago)

Author:

ak19

Message:

Implemented RSS support for GS3. At present, can see this with a=rss in the url, when a collection is built. Soon will have a button (at least for the GS3 demo collection).

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/action/RSSAction.java (added)
• src/java/org/greenstone/gsdl3/collection/ServiceCluster.java (modified) (1 diff)
• src/java/org/greenstone/gsdl3/service/RSSRetrieve.java (added)
• src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 diffs)
• src/java/org/greenstone/gsdl3/util/GSParams.java (modified) (1 diff)
• web/interfaces/default/interfaceConfig.xml (modified) (1 diff)
• web/interfaces/default/transform/gslib.xsl (modified) (1 diff)
• web/interfaces/default/transform/html-output.xsl (added)
• web/interfaces/default/transform/pages/rss.xsl (added)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -470 +470 @@
             s.setSiteAddress(this.site_http_address);
             s.setClusterName(this.cluster_name);
+            s.setServiceCluster(this);
             s.setMessageRouter(this.router);
             // pass the xml node to the service for configuration

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -24 +24 @@
 
 import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.collection.ServiceCluster;
 import org.greenstone.gsdl3.core.MessageRouter;
 import org.greenstone.gsdl3.core.ModuleInterface;
@@ -67 +68 @@
     protected MessageRouter router = null;
 
+        /** Access to the collection/serviceCluster object for service subclasses */
+        protected ServiceCluster serviceCluster = null;
+
     /** a converter class to create Documents etc */
     protected XMLConverter converter = null;
@@ -99 +103 @@
     {
         this.cluster_name = cluster_name;
+    }
+
+        /** sets the serviceCluster/Collection object */
+    public void setServiceCluster(ServiceCluster serviceCluster)
+    {
+        this.serviceCluster = serviceCluster;
     }
 

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

@@ -78 +78 @@
     // some standard arg values
     public static final String SYSTEM_ACTION = "s";
+
+    // rss feeds
+    public static final String RSS_ACTION = "rss";
 
     public static final String EXTERNAL_LINK_TYPE_DIRECT = "direct";

main/trunk/greenstone3/web/interfaces/default/interfaceConfig.xml

@@ -12 +12 @@
       <subaction name="html" xslt="html.xsl"/> <!-- use to put an external page into a frame with a collection header-->
     </action>
+    <action class="RSSAction" name="rss" xslt="pages/rss.xsl"/>
     <action class="QueryAction" name="q" xslt="pages/query.xsl"/>
     <action class="GS2BrowseAction" name="b" xslt="pages/classifier.xsl"/>

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

@@ -9 +9 @@
 
 
-<xsl:output
-    method="html" 
-    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" 
-    doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
-
-    <xsl:include href="xml-to-string.xsl"/>
+  <!-- force lower priority on xsl:output, so other files like rss.xsl can override with their own xsl:output stmt 
+    If other files don't specify any, gslib.xsl specifies html output as default and defines a loose DOCTYPE for it. -->
+  <xsl:import href="html-output.xsl" />
+
+  <xsl:include href="xml-to-string.xsl"/>
     
   <!-- some global parameters - these are set by whoever is invoking the transformation -->