From ceebb01ec2be826592836ec9b06562239ee674ee Mon Sep 17 00:00:00 2001 From: "Chris M. Hostetter" Date: Tue, 1 Jul 2008 00:24:25 +0000 Subject: [PATCH] SOLR-584: make stats.jsp and stats.xsl more robust to new info as they are added - spurred by core name not being displayed properly, fix also includes section for highlighting plugins and some general major refactoring of stats.xsl git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@672961 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 + src/webapp/web/admin/stats.jsp | 5 +- src/webapp/web/admin/stats.xsl | 347 ++++++--------------------------- 3 files changed, 66 insertions(+), 288 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 60232aa0455..98f3fecd94a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -446,6 +446,8 @@ Bug Fixes 37. SOLR-604: If the spellchecking path is relative, make it relative to the Solr Data Directory. (Shalin Shekhar Mangar via gsingers) +38. SOLR-584: Make stats.jsp and stats.xsl more robust. + (Yousef Ourabi and hossman) Other Changes 1. SOLR-135: Moved common classes to org.apache.solr.common and altered the diff --git a/src/webapp/web/admin/stats.jsp b/src/webapp/web/admin/stats.jsp index 89e0cafd95a..7e0f7b9cd89 100644 --- a/src/webapp/web/admin/stats.jsp +++ b/src/webapp/web/admin/stats.jsp @@ -25,7 +25,10 @@ - <%=core.getName()%> + <% + if (core.getName() != null) { %> + <%=core.getName()%> + <% } %> <%= collectionName %> <%= hostname %> <%= new Date().toString() %> diff --git a/src/webapp/web/admin/stats.xsl b/src/webapp/web/admin/stats.xsl index 803bdefb38b..e01c322e31f 100644 --- a/src/webapp/web/admin/stats.xsl +++ b/src/webapp/web/admin/stats.xsl @@ -33,19 +33,26 @@ + + + Solr Statistics: + + +() + - SOLR Statistics + <xsl:value-of select="$title"/> SOLR -

SOLR Statistics ()

+


@@ -66,6 +73,7 @@ [Cache] [Query] [Update] + [Highlighting] [Other] @@ -83,314 +91,79 @@ Server Start Time: + - + - - - - - - - - - - + + + + + + + : + + - + + + + + + + + + + + + +
+ + + + + + + +
+   + +
+ + +

Core

 - - - - - - -
-   - -
- - - - name:  - - -   - - - - - class:  - - -   - - - - - version:  - - -   - - - - - description:  - - -   - - - - - stats:  - - - - - : - -
- - - - - - - - - - - - -
+

Cache

 - - - - - - -
-   - -
- - - - name:  - - -   - - - - - class:  - - -   - - - - - version:  - - -   - - - - - description:  - - -   - - - - - stats:  - - - - - : - -
- - - - - - - - - - - - -
+

Query Handlers

 - - - - - - -
-   - -
- - - - name:  - - -   - - - - - class:  - - -   - - - - - version:  - - -   - - - - - description:  - - -   - - - - - stats:  - - - - - : - -
- - - - - - - - - - - - -
+

Update Handlers

 - - - - - - -
-   - -
- - - - name:  - - -   - - - - - class:  - - -   - - - - - version:  - - -   - - - - - description:  - - -   - - - - - stats:  - - - - - : - -
- - - - - - - - - + +

Highlighting

 - -
+ + +

+ + +

Other

 - - - - - - -
-   - -
- + name: