summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/service/LuceneService.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2015-05-22 11:39:49 -0600
committerJames Moger <james.moger@gitblit.com>2015-05-22 11:39:49 -0600
commita89679ebd62d5b524b8e6a11a2a6eccc2774e1a3 (patch)
treea8c375dc296fc857338034898cf3a14f7b7beafc /src/main/java/com/gitblit/service/LuceneService.java
parent99450c557d895c94e7eec618218d0f4bc5c16ffd (diff)
parent310a807f07ceeaa7d8fa0890d9061021707bbeb8 (diff)
downloadgitblit-a89679ebd62d5b524b8e6a11a2a6eccc2774e1a3.tar.gz
gitblit-a89679ebd62d5b524b8e6a11a2a6eccc2774e1a3.zip
Merged #253 "Implement configurable tab length support for blob views"
Diffstat (limited to 'src/main/java/com/gitblit/service/LuceneService.java')
-rw-r--r--src/main/java/com/gitblit/service/LuceneService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/service/LuceneService.java b/src/main/java/com/gitblit/service/LuceneService.java
index 3f7635f4..798edb0a 100644
--- a/src/main/java/com/gitblit/service/LuceneService.java
+++ b/src/main/java/com/gitblit/service/LuceneService.java
@@ -1104,6 +1104,7 @@ public class LuceneService implements Runnable {
content = "";
}
+ int tabLength = storedSettings.getInteger(Keys.web.tabLength, 4);
int fragmentLength = SearchObjectType.commit == result.type ? 512 : 150;
QueryScorer scorer = new QueryScorer(query, "content");
@@ -1126,7 +1127,7 @@ public class LuceneService implements Runnable {
if (fragment.length() > fragmentLength) {
fragment = fragment.substring(0, fragmentLength) + "...";
}
- return "<pre class=\"text\">" + StringUtils.escapeForHtml(fragment, true) + "</pre>";
+ return "<pre class=\"text\">" + StringUtils.escapeForHtml(fragment, true, tabLength) + "</pre>";
}
// make sure we have unique fragments