Changeset 26279

Timestamp:

2012-10-04T10:15:44+13:00 (12 years ago)

Author:

sjm84

Message:

Adding months to date list

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (3 diffs)
• web/interfaces/default/transform/classifiertools.xsl (modified) (1 diff)

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

@@ -44 +44 @@
     protected static HashMap<String, ArrayList<String>> _foundTableValues = new HashMap<String, ArrayList<String>>();
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.XSLTUtil.class.getName());
-
+    protected static HashMap<String, String> _stringVariables = new HashMap<String, String>();
+
+    public static void storeString(String name, String value)
+    {
+        _stringVariables.put(name, value);
+    }
+    
+    public static String getString(String name)
+    {
+        return _stringVariables.get(name);
+    }
+    
     /* some tests */
     public static boolean equals(String s1, String s2)
@@ -393 +404 @@
     public static String formatDate(String date, String lang)
     {
-
         String in_pattern = "yyyyMMdd";
         String out_pattern = "dd MMMM yyyy";
@@ -414 +424 @@
         }
 
+    }
+
+    public static String getDetailFromDate(String date, String detail, String lang)
+    {
+        String in_pattern = "yyyyMMdd";
+        if (date.length() == 6)
+        {
+            in_pattern = "yyyyMM";
+        }
+
+        SimpleDateFormat formatter = new SimpleDateFormat(in_pattern, new Locale(lang));
+        try
+        {
+            Date d = formatter.parse(date);
+            if (detail.toLowerCase().equals("day"))
+            {
+                formatter.applyPattern("dd");
+            }
+            else if (detail.toLowerCase().equals("month"))
+            {
+                formatter.applyPattern("MMMM");
+            }
+            else if (detail.toLowerCase().equals("year"))
+            {
+                formatter.applyPattern("yyyy");
+            }
+            else
+            {
+                return "";
+            }
+            return formatter.format(d);
+        }
+        catch (Exception ex)
+        {
+            return "";
+        }
     }
 

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

@@ -74 +74 @@
                         <xsl:choose>
                             <xsl:when test="name()='documentNode'">
+                                <xsl:if test="../@childType = 'DateList'">
+                                    <xsl:variable name="prevMonth"><xsl:value-of select="util:getString('prevMonth')"/></xsl:variable>
+                                    <xsl:variable name="currentDate"><gsf:metadata name="Date"/></xsl:variable>
+                                    <xsl:variable name="currentMonth"><xsl:value-of select="util:getDetailFromDate($currentDate, 'month', /page/@lang)"/></xsl:variable>
+                                    <xsl:value-of select="util:storeString('prevMonth', $currentMonth)"/>
+                                    <td>
+                                        <xsl:if test="not($currentMonth = $prevMonth)">
+                                            <xsl:value-of select="$currentMonth"/>
+                                        </xsl:if>
+                                        <xsl:text> </xsl:text>
+                                    </td>
+                                </xsl:if>
                                 <td>
                                     <table id="div{@nodeID}"><tr>