话题和资源加入搜索

polaris1119 · polaris1119 · commit 21a96926b625 · 2014-10-13T23:20:10.000+08:00
diff --git a/websites/code/studygolang/src/model/document.go b/websites/code/studygolang/src/model/document.go
@@ -34,6 +34,32 @@ func NewDocument(object interface{}, objectExt interface{}) *Document {
 	var document *Document
 	switch objdoc := object.(type) {
 	case *Topic:
+		viewnum, cmtnum, likenum := 0, 0, 0
+		if objectExt != nil {
+			// 传递过来的是一个 *TopicEx 对象，类型是有的，即时值是 nil，这里也和 nil 是不等
+			topicEx := objectExt.(*TopicEx)
+			if topicEx != nil {
+				viewnum = topicEx.View
+				cmtnum = topicEx.Reply
+				likenum = topicEx.Like
+			}
+		}
+
+		userLogin := NewUserLogin()
+		userLogin.Where("uid=?", objdoc.Uid).Find("username")
+		document = &Document{
+			Id:      fmt.Sprintf("%d%d", TYPE_TOPIC, objdoc.Tid),
+			Objid:   objdoc.Tid,
+			Objtype: TYPE_TOPIC,
+			Title:   objdoc.Title,
+			Author:  userLogin.Username,
+			PubTime: objdoc.Ctime,
+			Content: objdoc.Content,
+			Tags:    "",
+			Viewnum: viewnum,
+			Cmtnum:  cmtnum,
+			Likenum: likenum,
+		}
 	case *Article:
 		document = &Document{
 			Id:      fmt.Sprintf("%d%d", TYPE_ARTICLE, objdoc.Id),
@@ -49,6 +75,30 @@ func NewDocument(object interface{}, objectExt interface{}) *Document {
 			Likenum: objdoc.Likenum,
 		}
 	case *Resource:
+		viewnum, cmtnum, likenum := 0, 0, 0
+		if objectExt != nil {
+			resourceEx := objectExt.(*ResourceEx)
+			if resourceEx != nil {
+				viewnum = resourceEx.Viewnum
+				cmtnum = resourceEx.Cmtnum
+			}
+		}
+
+		userLogin := NewUserLogin()
+		userLogin.Where("uid=?", objdoc.Uid).Find("username")
+		document = &Document{
+			Id:      fmt.Sprintf("%d%d", TYPE_RESOURCE, objdoc.Id),
+			Objid:   objdoc.Id,
+			Objtype: TYPE_RESOURCE,
+			Title:   objdoc.Title,
+			Author:  userLogin.Username,
+			PubTime: objdoc.Ctime,
+			Content: objdoc.Content,
+			Tags:    "",
+			Viewnum: viewnum,
+			Cmtnum:  cmtnum,
+			Likenum: likenum,
+		}
 	case *Wiki:
 	}
 
diff --git a/websites/code/studygolang/src/server/indexer/main.go b/websites/code/studygolang/src/server/indexer/main.go
@@ -29,7 +29,7 @@ func main() {
 	c := cron.New()
 	// 构建 solr 需要的索引数据
 	// 一天一次全量
-	c.AddFunc("*/20 * * * * *", func() {
+	c.AddFunc("0 */1 * * * *", func() {
 		logger.Infoln("indexing start...")
 
 		start := time.Now()
diff --git a/websites/code/studygolang/src/service/searcher.go b/websites/code/studygolang/src/service/searcher.go
@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 
 	"config"
 	"logger"
@@ -25,6 +26,8 @@ const MaxRows = 100
 // isAll: 是否全量
 func Indexing(isAll bool) {
 	IndexingArticle(isAll)
+	IndexingTopic(isAll)
+	IndexingResource(isAll)
 }
 
 // 索引博文
@@ -63,6 +66,124 @@ func IndexingArticle(isAll bool) {
 	}
 }
 
+// 索引帖子
+func IndexingTopic(isAll bool) {
+	solrClient := NewSolrClient()
+
+	topicObj := model.NewTopic()
+	topicExObj := model.NewTopicEx()
+
+	limit := strconv.Itoa(MaxRows)
+	if isAll {
+		id := 0
+		for {
+			topicList, err := topicObj.Where("tid>?", id).Limit(limit).FindAll()
+			if err != nil {
+				logger.Errorln("IndexingTopic error:", err)
+				break
+			}
+
+			if len(topicList) == 0 {
+				break
+			}
+
+			tids := util.Models2Intslice(topicList, "Tid")
+
+			tmpStr := strings.Repeat("?,", len(tids))
+			query := "tid in(" + tmpStr[:len(tmpStr)-1] + ")"
+			args := make([]interface{}, len(tids))
+			for i, tid := range tids {
+				args[i] = tid
+			}
+
+			topicExList, err := topicExObj.Where(query, args...).FindAll()
+			if err != nil {
+				logger.Errorln("IndexingTopic error:", err)
+				break
+			}
+
+			topicExMap := make(map[int]*model.TopicEx, len(topicExList))
+			for _, topicEx := range topicExList {
+				topicExMap[topicEx.Tid] = topicEx
+			}
+
+			for _, topic := range topicList {
+				if id < topic.Tid {
+					id = topic.Tid
+				}
+
+				topicEx, _ := topicExMap[topic.Tid]
+
+				document := model.NewDocument(topic, topicEx)
+				addCommand := model.NewDefaultArgsAddCommand(document)
+
+				solrClient.Push(addCommand)
+			}
+
+			solrClient.Post()
+		}
+	}
+}
+
+// 索引资源
+func IndexingResource(isAll bool) {
+	solrClient := NewSolrClient()
+
+	resourceObj := model.NewResource()
+	resourceExObj := model.NewResourceEx()
+
+	limit := strconv.Itoa(MaxRows)
+	if isAll {
+		id := 0
+		for {
+			resourceList, err := resourceObj.Where("id>?", id).Limit(limit).FindAll()
+			if err != nil {
+				logger.Errorln("IndexingResource error:", err)
+				break
+			}
+
+			if len(resourceList) == 0 {
+				break
+			}
+
+			ids := util.Models2Intslice(resourceList, "Id")
+
+			tmpStr := strings.Repeat("?,", len(ids))
+			query := "id in(" + tmpStr[:len(tmpStr)-1] + ")"
+			args := make([]interface{}, len(ids))
+			for i, rid := range ids {
+				args[i] = rid
+			}
+
+			resourceExList, err := resourceExObj.Where(query, args...).FindAll()
+			if err != nil {
+				logger.Errorln("IndexingResource error:", err)
+				break
+			}
+
+			resourceExMap := make(map[int]*model.ResourceEx, len(resourceExList))
+			for _, resourceEx := range resourceExList {
+				resourceExMap[resourceEx.Id] = resourceEx
+			}
+
+			for _, resource := range resourceList {
+				if id < resource.Id {
+					id = resource.Id
+				}
+
+				resourceEx, _ := resourceExMap[resource.Id]
+
+				document := model.NewDocument(resource, resourceEx)
+				addCommand := model.NewDefaultArgsAddCommand(document)
+
+				solrClient.Push(addCommand)
+			}
+
+			solrClient.Post()
+		}
+	}
+}
+
 type SolrClient struct {
 	addCommands []*model.AddCommand
 }
@@ -206,7 +327,7 @@ func DoSearch(q, field string, start, rows int) (*model.ResponseBody, error) {
 				doc.HlTitle = doc.Title
 			}
 
-			if doc.HlContent == "" {
+			if doc.HlContent == "" && doc.Content != "" {
 				maxLen := len(doc.Content) - 1
 				if maxLen > ContentLen {
 					maxLen = ContentLen
diff --git a/websites/code/studygolang/template/search.html b/websites/code/studygolang/template/search.html
@@ -47,23 +47,33 @@
 			<div class="row">
 				<div>
 					<h2>
-						<a href="/articles/{{.Objid}}" target="_blank" title="{{.Title}}">{{noescape .HlTitle}}</a></h2>
+						<a href="/{{if eq .Objtype 0}}topics{{else if eq .Objtype 1}}articles{{else}}resources{{end}}/{{.Objid}}" target="_blank" title="{{.Title}}">{{noescape .HlTitle}}</a></h2>
+					{{if .Content}}
 					<p class="text">{{noescape .HlContent}}<a href="/articles/{{.Objid}}" target="_blank" title="阅读全文">阅读全文</a></p>
+					{{end}}
 				</div>
 			</div>
 			<div class="row">
 				<div class="col-md-8 metatag">
+					<i class="glyphicon glyphicon-tasks"></i>
+					<span class="source" title="类别">{{if eq .Objtype 0}}话题{{else if eq .Objtype 1}}博文{{else}}帖子{{end}}</span>
 					<i class="glyphicon glyphicon-calendar"></i>
 					<span class="date" title="发布日期">{{.PubTime}}</span>
 					<i class="glyphicon glyphicon-user"></i>
-					<span class="author" title="作者">{{.Author}}</span>
+					<span class="author" title="作者">
+					{{if eq .Objtype 1}}
+						{{.Author}}
+					{{else}}
+						<a href="/user/{{.Author}}" target="_blank">{{.Author}}</a>
+					{{end}}
+					</span>
 					{{if .Tags}}
 					{{$tags := explode .Tags ","}}
 					<ul class="list-inline">
 						<i class="glyphicon glyphicon-tags"></i>
 						{{range $tag := $tags}}
 						<li>
-							<a href="/" title="{{$tag}}" target="_blank">
+							<a href="/search?q={{$tag}}f=tag" title="{{$tag}}" target="_blank">
 								{{$tag}}
 							</a>
 						</li>
diff --git a/websites/databases/studygolang_db.sql b/websites/databases/studygolang_db.sql
@@ -335,7 +335,7 @@ CREATE TABLE `articles` (
   `author_txt` varchar(127) NOT NULL DEFAULT '' COMMENT '文章作者(纯文本)',
   `lang` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '语言：0-中文；1-英文',
   `pub_date` varchar(20) NOT NULL DEFAULT '' COMMENT '发布时间',
-  `url` varchar(127) NOT NULL DEFAULT '' COMMENT '文章原始链接',
+  `url` varchar(255) NOT NULL DEFAULT '' COMMENT '文章原始链接',
   `content` longtext NOT NULL COMMENT '正文(带html)',
   `txt` text NOT NULL COMMENT '正文(纯文本)',
   `tags` varchar(50) NOT NULL DEFAULT '' COMMENT '文章tag，逗号分隔',
