Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-01 02:56:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #3)Apply likeEncode to search keyword.

Browse Source
This commit is contained in:
takezoe
2013-07-18 00:47:55 +09:00
parent 69ec4175eb
commit 4fb6005f44
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/scala/service/IssuesService.scala
View File

@@ -236,13 +236,22 @@ trait IssuesService {
}
.update (closed, currentDate)
def queryIssues(owner: String, repository: String, query: String): List[(Issue, Int, String)] = {
val lowerQueries = StringUtil.splitWords(query.toLowerCase)
/**
* Search issues by keyword.
*
* @param owner the repository owner
* @param repository the repository name
* @param query the keywords separated by whitespace.
* @return issues with comment count and matched content of issue or comment
*/
def searchIssuesByKeyword(owner: String, repository: String, query: String): List[(Issue, Int, String)] = {
import scala.slick.driver.H2Driver.likeEncode
val keywords = StringUtil.splitWords(query.toLowerCase)
// Search Issue
val issues = Query(Issues).filter { t =>
lowerQueries.map { query =>
(t.title.toLowerCase like '%' + query + '%') || (t.content.toLowerCase like '%' + query + '%') // TODO escape!!!!
keywords.map { keyword =>
(t.title.toLowerCase like (s"%${likeEncode(keyword)}%", '^')) || (t.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
} .reduceLeft { (a, b) =>
a && b
}
@@ -252,8 +261,8 @@ trait IssuesService {
val comments = Query(IssueComments).innerJoin(Issues).on { case (t1, t2) =>
t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
}.filter { case (t1, t2) =>
lowerQueries.map { query =>
t1.content.toLowerCase like '%' + query + '%' // TODO escape!!!!
keywords.map { query =>
t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
}.reduceLeft { (a, b) =>
a && b
}