From f3ce6e80794ff3a234dbd8850c8501abda95cedb Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 11 Jul 2012 17:14:30 -0400 Subject: [PATCH] Fixes and adjustments to test suite --- src/com/gitblit/LuceneExecutor.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java index 961267b..c702dcc 100644 --- a/src/com/gitblit/LuceneExecutor.java +++ b/src/com/gitblit/LuceneExecutor.java @@ -73,6 +73,7 @@ import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryCache.FileKey; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; @@ -104,7 +105,7 @@ public class LuceneExecutor implements Runnable { - private static final int INDEX_VERSION = 2; + private static final int INDEX_VERSION = 3; private static final String FIELD_OBJECT_TYPE = "type"; private static final String FIELD_ISSUE = "issue"; @@ -641,6 +642,7 @@ String branch, RevCommit commit) { IndexResult result = new IndexResult(); try { + String [] encodings = storedSettings.getStrings(Keys.web.blobEncodings).toArray(new String[0]); List<PathChangeModel> changedPaths = JGitUtils.getFilesInCommit(repository, commit); String revDate = DateTools.timeToString(commit.getCommitTime() * 1000L, Resolution.MINUTE); @@ -673,7 +675,7 @@ if (StringUtils.isEmpty(ext) || !excludedExtensions.contains(ext)) { // read the blob content String str = JGitUtils.getStringContent(repository, commit.getTree(), - path.path); + path.path, encodings); doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED)); writer.addDocument(doc); } @@ -1042,8 +1044,8 @@ * @throws IOException */ private IndexWriter getIndexWriter(String repository) throws IOException { - IndexWriter indexWriter = writers.get(repository); - File repositoryFolder = new File(repositoriesFolder, repository); + IndexWriter indexWriter = writers.get(repository); + File repositoryFolder = FileKey.resolve(new File(repositoriesFolder, repository), FS.DETECTED); File indexFolder = new File(repositoryFolder, LUCENE_DIR); Directory directory = FSDirectory.open(indexFolder); @@ -1203,7 +1205,13 @@ return "<pre class=\"text\">" + StringUtils.escapeForHtml(fragment, true) + "</pre>"; } - int contentPos = 0; + // make sure we have unique fragments + Set<String> uniqueFragments = new LinkedHashSet<String>(); + for (String fragment : fragments) { + uniqueFragments.add(fragment); + } + fragments = uniqueFragments.toArray(new String[uniqueFragments.size()]); + StringBuilder sb = new StringBuilder(); for (int i = 0, len = fragments.length; i < len; i++) { String fragment = fragments[i]; @@ -1213,7 +1221,7 @@ String raw = fragment.replace(termTag, "").replace(termTagEnd, ""); // determine position of the raw fragment in the content - int pos = content.indexOf(raw, contentPos); + int pos = content.indexOf(raw); // restore complete first line of fragment int c = pos; @@ -1241,8 +1249,6 @@ } tag = MessageFormat.format("<pre class=\"prettyprint linenums:{0,number,0}{1}\">", line, lang); - // update offset into content - contentPos = pos + raw.length() + 1; } sb.append(tag); -- Gitblit v1.9.1