[tor-commits] [metrics-web/master] Add microdescriptor tarballs to data page.

[karsten at torproject.org]

commit 2cc7f80ee335e4314951eda1dc33c7788efd0aaf
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jan 29 12:03:19 2014 +0100

    Add microdescriptor tarballs to data page.
---
 .../torproject/metrics/web/research/ResearchDataServlet.java   |    3 ++-
 website/web/WEB-INF/data.jsp                                   |    8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java b/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java
index 8e3788d..f4db150 100644
--- a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java
+++ b/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java
@@ -103,7 +103,8 @@ public class ResearchDataServlet extends HttpServlet {
           filename.startsWith("server-descriptors-20") ||
           filename.startsWith("extra-infos-20") ||
           filename.startsWith("votes-20") ||
-          filename.startsWith("consensuses-20")) {
+          filename.startsWith("consensuses-20") ||
+          filename.startsWith("microdescs-20")) {
         String type = filename.substring(0, filename.indexOf("-20"));
         String yearMonth = filename.substring(filename.indexOf("20"));
         yearMonth = yearMonth.substring(0, 7);
diff --git a/website/web/WEB-INF/data.jsp b/website/web/WEB-INF/data.jsp
index 06176db..40475f7 100644
--- a/website/web/WEB-INF/data.jsp
+++ b/website/web/WEB-INF/data.jsp
@@ -96,6 +96,14 @@
                   </c:if>
                 </c:if>
               </td>
+              <td>
+                <c:if test="${item.value['microdescs'] ne null}" >
+                  <a href="${item.value['microdescs'][0]}">microdescriptors</a>
+                  <c:if test="${item.value['microdescs'][1] ne null}">
+                    (<a href="${item.value['microdescs'][1]}">sig</a>)
+                  </c:if>
+                </c:if>
+              </td>
             </tr>
           </c:forEach>
         </table>