From 63083944b188daac391cceb01061871d7682bbf3 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryan@apache.org>
Date: Mon, 6 Jun 2011 18:37:56 +0000
Subject: [PATCH] SOLR-2399: fix stopwords and added field sorting

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1132724 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/src/webapp/web/css/screen.css |  5 +++++
 solr/src/webapp/web/js/script.js   | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/solr/src/webapp/web/css/screen.css b/solr/src/webapp/web/css/screen.css
index ae7e13a278e..0c2f0594a15 100644
--- a/solr/src/webapp/web/css/screen.css
+++ b/solr/src/webapp/web/css/screen.css
@@ -757,6 +757,11 @@ ul
     padding: 1px 2px;
 }
 
+#content #analysis .analysis-result .row table td div.empty
+{
+    color: #f0f0f0;
+}
+
 #content #analysis .analysis-result .row table td div.match
 {
     background-color: #e9eff7;
diff --git a/solr/src/webapp/web/js/script.js b/solr/src/webapp/web/js/script.js
index 0c1145fb87a..45d6789aabc 100644
--- a/solr/src/webapp/web/js/script.js
+++ b/solr/src/webapp/web/js/script.js
@@ -1893,7 +1893,7 @@ var sammy = $.sammy
                                                     {
                                                         fields.sort();
                                                         related_options += '<optgroup label="Fields">' + "\n";
-                                                        related_options += fields.join( "\n" ) + "\n";
+                                                        related_options += fields.sort().join( "\n" ) + "\n";
                                                         related_options += '</optgroup>' + "\n";
                                                     }
                                                     
@@ -1909,7 +1909,7 @@ var sammy = $.sammy
                                                     {
                                                         dynamic_fields.sort();
                                                         related_options += '<optgroup label="DynamicFields">' + "\n";
-                                                        related_options += dynamic_fields.join( "\n" ) + "\n";
+                                                        related_options += dynamic_fields.sort().join( "\n" ) + "\n";
                                                         related_options += '</optgroup>' + "\n";
                                                     }
                                                     
@@ -1925,7 +1925,7 @@ var sammy = $.sammy
                                                     {
                                                         types.sort();
                                                         related_options += '<optgroup label="Types">' + "\n";
-                                                        related_options += types.join( "\n" ) + "\n";
+                                                        related_options += types.sort().join( "\n" ) + "\n";
                                                         related_options += '</optgroup>' + "\n";
                                                     }
 
@@ -3289,7 +3289,7 @@ var sammy = $.sammy
                                     if( 0 !== fields.length )
                                     {
                                         content += '<optgroup label="Fields">' + "\n";
-                                        content += fields.join( "\n" ) + "\n";
+                                        content += fields.sort().join( "\n" ) + "\n";
                                         content += '</optgroup>' + "\n";
                                     }
                                     
@@ -3304,7 +3304,7 @@ var sammy = $.sammy
                                     if( 0 !== types.length )
                                     {
                                         content += '<optgroup label="Types">' + "\n";
-                                        content += types.join( "\n" ) + "\n";
+                                        content += types.sort().join( "\n" ) + "\n";
                                         content += '</optgroup>' + "\n";
                                     }
                                     
@@ -3433,7 +3433,14 @@ var sammy = $.sammy
                                                 var length = raw_parts[key].length;
                                                 for( var j = 0; j < length; j++ )
                                                 {
-                                                    parts[key].push( '<td>' + raw_parts[key][j].join( "\n" ) + '</td>' );
+                                                    if( raw_parts[key][j] )
+                                                    {
+                                                        parts[key].push( '<td>' + raw_parts[key][j].join( "\n" ) + '</td>' );
+                                                    }
+                                                    else
+                                                    {
+                                                        parts[key].push( '<td><div class="empty">&empty;</div></td>' );
+                                                    }
                                                 }
                                             }