lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steff...@apache.org
Subject svn commit: r1578444 - in /lucene/dev/branches/lucene_solr_4_7: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/ lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards...
Date Mon, 17 Mar 2014 16:12:13 GMT
Author: steffkes
Date: Mon Mar 17 16:12:11 2014
New Revision: 1578444

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

Modified:
    lucene/dev/branches/lucene_solr_4_7/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/dev-tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/BUILD.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/JRE_VERSION_MIGRATION.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/MIGRATE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/ASCIITLD.jflex-macro
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/SUPPLEMENTARY.jflex-macro
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/package.html
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/backwards/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/classification/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/classification/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/classification/ivy.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/classification/src/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/codecs/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/search/TestSort.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/demo/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/expressions/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/facet/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/grouping/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/highlighter/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/ivy-settings.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/ivy-versions.properties   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/join/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/memory/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/misc/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/module-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/queries/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/queryparser/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/replicator/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/sandbox/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/spatial/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/spatial/src/test-files/data/simple-bbox.txt
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/spatial/src/test-files/simple-Queries-BBox.txt
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/suggest/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt
    lucene/dev/branches/lucene_solr_4_7/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/cloud-dev/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/contrib/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/core/TestConfig.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/example/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/httpclient-LICENSE-ASL.txt   (props
changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/httpclient-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/httpcore-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/httpcore-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/httpmime-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/licenses/httpmime-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/scripts/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/solrj/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/webapp/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/webapp/web/js/scripts/analysis.js

Modified: lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt?rev=1578444&r1=1578443&r2=1578444&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt Mon Mar 17 16:12:11 2014
@@ -335,6 +335,9 @@ Bug Fixes
 * SOLR-5770: All attempts to match a SolrCore with it's state in clusterstate.json 
   should be done with the CoreNodeName. (Steve Davids via Mark Miller)
 
+* SOLR-5800: Admin UI - Analysis form doesn't render results correctly when a
+  CharFilter is used. (steffkes)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/lucene_solr_4_7/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/webapp/web/js/scripts/analysis.js?rev=1578444&r1=1578443&r2=1578444&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/webapp/web/js/scripts/analysis.js Mon Mar 17
16:12:11 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";
                                 



Mime
View raw message