From 16e4747d3cb2c2a53a6bef554bca306d8594a080 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 14 Sep 2012 17:51:04 -0400
Subject: [PATCH] Mostly complete blob view line links feature, DOM offset bug remains (issue 130)
---
src/com/gitblit/models/SearchResult.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/models/SearchResult.java b/src/com/gitblit/models/SearchResult.java
index 2fa0db4..efd1b07 100644
--- a/src/com/gitblit/models/SearchResult.java
+++ b/src/com/gitblit/models/SearchResult.java
@@ -4,7 +4,7 @@
import java.util.Date;
import java.util.List;
-import com.gitblit.utils.LuceneUtils.ObjectType;
+import com.gitblit.Constants.SearchObjectType;
/**
* Model class that represents a search result.
@@ -15,6 +15,10 @@
public class SearchResult implements Serializable {
private static final long serialVersionUID = 1L;
+
+ public int hitId;
+
+ public int totalHits;
public float score;
@@ -26,21 +30,41 @@
public String summary;
+ public String fragment;
+
public String repository;
public String branch;
- public String id;
+ public String commitId;
+
+ public String path;
+
+ public String issueId;
+ public List<String> tags;
+
public List<String> labels;
- public ObjectType type;
+ public SearchObjectType type;
public SearchResult() {
+ }
+
+ public String getId() {
+ switch (type) {
+ case blob:
+ return path;
+ case commit:
+ return commitId;
+ case issue:
+ return issueId;
+ }
+ return commitId;
}
@Override
public String toString() {
- return score + " : " + type.name() + " : " + repository + " : " + id + " (" + branch + ")";
+ return score + " : " + type.name() + " : " + repository + " : " + getId() + " (" + branch + ")";
}
}
\ No newline at end of file
--
Gitblit v1.9.1