Use correct page title in search results

szeiger · Oct 9, 2016 · 5bf24fb · 5bf24fb
1 parent 729618b
commit 5bf24fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/src/main/scala/com/novocode/ornate/Site.scala b/core/src/main/scala/com/novocode/ornate/Site.scala
@@ -13,6 +13,8 @@ class Site(val pages: Vector[Page], val toc: Vector[TocEntry]) {
   def getPageFor(uri: URI): Option[Page] =
     if(uri.getScheme == Util.siteRootURI.getScheme) pageMap.get(uri.getPath)
     else None
+
+  def findTocEntry(p: Page): Option[TocEntry] = toc.find(te => te.page eq p)
 }
 
 class Page(val sourceFileURI: Option[URI], val uri: URI, val suffix: String, val doc: Node, val config: Config,

diff --git a/core/src/main/scala/com/novocode/ornate/theme/HtmlTheme.scala b/core/src/main/scala/com/novocode/ornate/theme/HtmlTheme.scala
@@ -293,7 +293,7 @@ class HtmlTheme(global: Global) extends Theme(global) { self =>
           logger.debug(s"Excluding page ${p.uri} from search index")
         else {
           val body = NodeUtil.extractText(p.doc).trim
-          val title = p.section.title.getOrElse("").trim
+          val title = site.findTocEntry(p).flatMap(_.title).orElse(p.section.title).getOrElse("").trim
           val excerpt = if(excerptLength > 0) {
             val bodyOnly = NodeUtil.extractText(p.doc, withCodeBlocks=false, withFirstHeading=false, limit=excerptLength).trim
             val short = bodyOnly.indexOf(' ', excerptLength) match {