Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix display of multiple tokens at same position: SOLR-168 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@513152 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2007-03-01 05:46:34 +00:00
parent 50c59eb8b6
commit 52d00cda6a
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -172,6 +172,9 @@ Bug Fixes
when finished. Also modified ResponseWriters to only fetch a Searcher
reference if necessary for writing out DocLists.
(Ryan McKinley via hossman)
7. SOLR-168: Fix display positioning of multiple tokens at the same
position in analysis.jsp (yonik)
Other Changes
1. Updated to Lucene 2.1

23
src/webapp/resources/admin/analysis.jsp
View File

@ -249,7 +249,8 @@
}
}
for (List<Tok> lst : arrLst) {
for (int posIndex=0; posIndex<arrLst.length; posIndex++) {
List<Tok> lst = arrLst[posIndex];
if (lst.size() <= idx) continue;
if (match!=null && match.contains(lst.get(idx))) {
out.print("<td class=\"highlight\"");
@ -257,8 +258,10 @@
out.print("<td class=\"debugdata\"");
}
if (idx==0 && lst.size()==1 && maxSz > 1) {
out.print("rowspan=\""+maxSz+'"');
// if the last value in the column, use up
// the rest of the space via rowspan.
if (lst.size() == idx+1 && lst.size() < maxSz) {
out.print("rowspan=\""+(maxSz-lst.size()+1)+'"');
}
out.print('>');
@ -309,25 +312,11 @@
List<Tok>[] arr = (List<Tok>[])map.values().toArray(new ArrayList[map.size()]);
/***
// This generics version works fine with Resin, but fails with Tomcat 5.5
// with java.lang.AbstractMethodError
// at java.util.Arrays.mergeSort(Arrays.java:1284)
// at java.util.Arrays.sort(Arrays.java:1223)
Arrays.sort(arr, new Comparator<List<Tok>>() {
public int compare(List<Tok> toks, List<Tok> toks1) {
return toks.get(0).pos - toks1.get(0).pos;
}
}
***/
Arrays.sort(arr, new Comparator() {
public int compare(Object a, Object b) {
List<Tok> toks = (List<Tok>)a;
List<Tok> toks1 = (List<Tok>)b;
return toks.get(0).pos - toks1.get(0).pos;
}
}
);
out.println("<table width=\"auto\" class=\"analysis\" border=\"1\">");