You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2014/03/12 10:02:21 UTC

svn commit: r1576652 - in /lucene/dev/trunk/solr: CHANGES.txt webapp/web/js/scripts/analysis.js

Author: steffkes
Date: Wed Mar 12 09:02:20 2014
New Revision: 1576652

URL: http://svn.apache.org/r1576652
Log:
SOLR-5800: Admin UI - Analysis form doesn't render results correctly when a CharFilter is used

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1576652&r1=1576651&r2=1576652&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 12 09:02:20 2014
@@ -144,6 +144,9 @@ Bug Fixes
 * SOLR-5839: ZookeeperInfoServlet does not trim path properly.
   (Furkan KAMACI via Mark Miller)
 
+* SOLR-5800: Admin UI - Analysis form doesn't render results correctly when a
+  CharFilter is used. (steffkes)
+
 Optimizations
 ----------------------
 * SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY

Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js?rev=1576652&r1=1576651&r2=1576652&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js Wed Mar 12 09:02:20 2014
@@ -360,13 +360,19 @@ sammy.get
                   analysis_data[type][1] = [{ 'text': analysis_data[type][1] }]
                 }
 
-                var c = analysis_data[type][1].length;
-                for( var i = 0; i < c; i++ )
+                for( var i = 1; i < type_length; i += 2 )
                 {
-                  global_elements_count = Math.max( analysis_data[type][1][i].position || 0, global_elements_count );
+                  var tmp_type_length = analysis_data[type][i].length;
+                  for( var j = 0; j < tmp_type_length; j++ )
+                  {
+                    global_elements_count = Math.max
+                    (
+                      ( analysis_data[type][i][j].positionHistory || [] )[0] || 1,
+                      global_elements_count
+                    );
+                  }
                 }
 
-
                 var content = '<div class="' + type + '">' + "\n";
                 content += '<table border="0" cellspacing="0" cellpadding="0">' + "\n";