搜索支持关键词高亮，修复最后一页错误的问题

matyhtf · matyhtf · commit 84b36bc0d0ae · 2017-02-05T18:38:04.000+08:00
diff --git a/server/apps/controllers/Wiki.php b/server/apps/controllers/Wiki.php
@@ -40,6 +40,17 @@ function index()
         $this->swoole->tpl->display("wiki/noframe/index.html");
     }
 
+    /**
+     * 高亮关键词
+     * @param \XSSearch $xs
+     * @param $subject
+     * @return mixed
+     */
+    protected static function highlight($xs, $subject)
+    {
+        return $xs->highlight(htmlspecialchars($subject, ENT_QUOTES, 'UTF-8'));
+    }
+
     function search()
     {
         if (isset($_GET['prid']))
@@ -63,12 +74,14 @@ function search()
 
         $pagesize = 10;
         $page = empty($_GET['page']) ? 1: intval($_GET['page']);
+
+        $s = microtime(true);
         $xs = new \XS(WEBPATH.'/search.ini');
         $search = $xs->getSearch();
         $q = trim($_GET['q']);
         $search->setQuery($q);
         $total = $search->count();
-        if ($page * $pagesize > $total)
+        if (($page - 1) * $pagesize > $total)
         {
             $page = 1;
         }
@@ -79,12 +92,14 @@ function search()
         foreach ($docs as $doc)
         {
             $li['id'] = $doc->pid;
-            $li['title'] = $doc->subject;
-            $li['desc'] = $doc->message;
+            $li['title'] = self::highlight($search, $doc->subject);
+            $li['desc'] = self::highlight($search, $doc->message);
             $list[] = $li;
         }
         $pager->page_tpl = "/wiki/search/?q=".urlencode($_GET['q']).'&page={page}';
         $this->tpl->assign('list', $list);
+        $this->tpl->assign('cost_time', round(microtime(true) - $s, 3));
+        $this->tpl->assign('count', $total);
         $this->tpl->assign('pager', $pager->render());
         $this->tpl->display("wiki/noframe/search.html");
     }
diff --git a/server/apps/templates/wiki/noframe/search.html b/server/apps/templates/wiki/noframe/search.html
@@ -75,7 +75,8 @@ <h3><a href="/wiki/page/{{$v.id}}.html">{{$v.text}}</a></h3>
         </div>
     </div>
     <div class="wiki_content blob instapaper_body">
-        <article class="markdown-body entry-content" itemprop="mainContentOfPage">
+        <article class="markdown-body" id="search_result">
+            <div id="ResultStats">找到约 {{$count}} 条结果 （用时约 {{$cost_time}} 秒）</div>
             {{foreach item=li from=$list}}
             <h2><a href="/wiki/page/{{$li.id}}.html" target="_blank">{{$li.title}}</a></h2>
             <div>
diff --git a/web/static/css/wiki/noframe.css b/web/static/css/wiki/noframe.css
@@ -66,3 +66,8 @@
     background-color: #ffffff;
     border: 1px solid #dddddd;
 }
+
+#search_result em {
+    color: #dd4b39;
+    font-style: normal;
+}

Original file line number	Diff line number	Diff line change
`@@ -66,3 +66,8 @@`
`66`	`66`	`background-color: #ffffff;`
`67`	`67`	`border: 1px solid #dddddd;`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+#search_result em {`
	`71`	`+ color: #dd4b39;`
	`72`	`+ font-style: normal;`
	`73`	`+}`