bugfix

polaris1119 · polaris1119 · commit 0aa1efb8328f · 2014-10-19T10:28:48.000+08:00
diff --git a/websites/code/studygolang/src/service/article.go b/websites/code/studygolang/src/service/article.go
@@ -241,10 +241,14 @@ func FindArticlesById(idstr string) (curArticle *model.Article, prevNext []*mode
 		return
 	}
 
+	if len(articles) == 0 {
+		return
+	}
+
 	prevNext = make([]*model.Article, 2)
-	prevId, nextId := id, id
+	prevId, nextId := articles[0], id
 	for _, article := range articles {
-		if article.Id < id {
+		if article.Id < id && article.Id > prevId {
 			prevId = article.Id
 			prevNext[0] = article
 		} else if article.Id > id {
diff --git a/websites/code/studygolang/src/service/searcher.go b/websites/code/studygolang/src/service/searcher.go
@@ -279,7 +279,12 @@ func DoSearch(q, field string, start, rows int) (*model.ResponseBody, error) {
 		}
 	}
 
-	if field == "text" {
+	isTag := false
+	// TODO: 目前大部分都没有tag，因此，对tag特殊处理
+	if field == "text" || field == "tag" {
+		if field == "tag" {
+			isTag = true
+		}
 		field = ""
 	}
 
@@ -291,7 +296,11 @@ func DoSearch(q, field string, start, rows int) (*model.ResponseBody, error) {
 	} else {
 		// 全文检索
 		if q != "" {
-			values.Add("q", "title:"+q+"^2"+" OR content:"+q+"^0.2")
+			if isTag {
+				values.Add("q", "title:"+q+"^2"+" OR tags:"+q+"^4 OR content:"+q+"^0.2")
+			} else {
+				values.Add("q", "title:"+q+"^2"+" OR content:"+q+"^0.2")
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,12 @@ func DoSearch(q, field string, start, rows int) (*model.ResponseBody, error) {`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`		`- if field == "text" {`
	`282`	`+ isTag := false`
	`283`	`+ // TODO: 目前大部分都没有tag，因此，对tag特殊处理`
	`284`	`+ if field == "text" \|\| field == "tag" {`
	`285`	`+ if field == "tag" {`
	`286`	`+ isTag = true`
	`287`	`+ }`
`283`	`288`	`field = ""`
`284`	`289`	`}`
`285`	`290`
`@@ -291,7 +296,11 @@ func DoSearch(q, field string, start, rows int) (*model.ResponseBody, error) {`
`291`	`296`	`} else {`
`292`	`297`	`// 全文检索`
`293`	`298`	`if q != "" {`
`294`		`- values.Add("q", "title:"+q+"^2"+" OR content:"+q+"^0.2")`
	`299`	`+ if isTag {`
	`300`	`+ values.Add("q", "title:"+q+"^2"+" OR tags:"+q+"^4 OR content:"+q+"^0.2")`
	`301`	`+ } else {`
	`302`	`+ values.Add("q", "title:"+q+"^2"+" OR content:"+q+"^0.2")`
	`303`	`+ }`
`295`	`304`	`}`
`296`	`305`	`}`
`297`	`306`