From 964e47e351718cfd6c8faf24099e1d1041224689 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Nov 09 2020 13:52:58 +0000
Subject: create search results template


---
diff --git a/solr/schema.xml b/solr/schema.xml
index 1a7171c..42c8660 100644
--- a/solr/schema.xml
+++ b/solr/schema.xml
@@ -10,7 +10,7 @@
   <fieldType name="nameText" class="solr.TextField">
     <analyzer type="index">
       <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" />
+      <filter class="solr.WordDelimiterGraphFilterFactory" preserveOriginal="1" />
       <filter class="solr.LowerCaseFilterFactory"/>
       <filter class="solr.FlattenGraphFilterFactory"/>
     </analyzer>
@@ -21,28 +21,28 @@
     </analyzer>
   </fieldType>
   <!-- Currently disabled. TODO: turn \n into space, stem filter not working -->
-  <fieldType name="descText" class="solr.SortableTextField" positionIncrementGap="100" uninvertible="false">
+  <!-- <fieldType name="descText" class="solr.SortableTextField" positionIncrementGap="100" uninvertible="false">
     <analyzer type="index">
       <tokenizer class="solr.StandardTokenizerFactory"/>
-      <!-- <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/> -->
-      <!-- <filter class="solr.FlattenGraphFilterFactory"/> -->
+      <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+      <filter class="solr.FlattenGraphFilterFactory"/>
       <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt" />
       <filter class="solr.LowerCaseFilterFactory"/>
       <filter class="solr.EnglishPossessiveFilterFactory"/>
-      <!-- <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/> -->
+      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
       <filter class="solr.EnglishMinimalStemFilterFactory"/>
-      <!-- <filter class="solr.PorterStemFilterFactory"/> -->
+      <filter class="solr.PorterStemFilterFactory"/>
     </analyzer>
     <analyzer type="query">
       <tokenizer class="solr.StandardTokenizerFactory"/>
       <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt" />
       <filter class="solr.LowerCaseFilterFactory"/>
       <filter class="solr.EnglishPossessiveFilterFactory"/>
-      <!-- <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/> -->
+      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
       <filter class="solr.EnglishMinimalStemFilterFactory"/>
-      <!-- <filter class="solr.PorterStemFilterFactory"/> -->
+      <filter class="solr.PorterStemFilterFactory"/>
     </analyzer>
-  </fieldType>
+  </fieldType> -->
 
   <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
   <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
diff --git a/solr/solrconfig.xml b/solr/solrconfig.xml
index eb9b5fa..0fc3f8b 100644
--- a/solr/solrconfig.xml
+++ b/solr/solrconfig.xml
@@ -703,6 +703,7 @@
       <int name="rows">10</int>
       <str name="spellcheck">true</str>
       <str name="spellcheck.dictionary">default</str>
+      <str name="spellcheck.collate">true</str>
       <!-- Default search field
       <str name="df">name</str> 
         -->
@@ -834,7 +835,7 @@
     -->
   <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
 
-    <!-- <str name="queryAnalyzerFieldType">text</str> -->
+    <str name="queryAnalyzerFieldType">nameText</str>
 
     <!-- Multiple "Spell Checkers" can be declared and used by this
          component
diff --git a/templates/search-results.html.j2 b/templates/search-results.html.j2
index a24f4eb..7fc2a25 100644
--- a/templates/search-results.html.j2
+++ b/templates/search-results.html.j2
@@ -1,29 +1,72 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<title>Fedora Packages</title>
-		<link rel="stylesheet" href="assets/css/bootstrap.min.css">
-		<link rel="stylesheet" href="assets/css/main.css">
-	</head>
-	<body>
-		<div class="page">
-			<div id="logo">
-				<img src="assets/images/logo.png">
-			</div>
-			<form action="/search" method="get">
-				<div class="form-row">
-					<div class="form-group col-md-8">
-						<input class="form-control" type="search" placeholder="Search" name="query" aria-label="Search">
-					</div>
-					<div class="form-group col-md-4">
-						<button class="btn btn-primary btn-block" type="submit">Search &raquo;</button>
+
+<head>
+	<title>Fedora Packages</title>
+	<link rel="stylesheet"
+		href="assets/css/bootstrap.min.css">
+	<link rel="stylesheet"
+		href="assets/css/main.css">
+</head>
+
+<body>
+	<div class="page-large">
+		<div class="container">
+			<div class="row">
+				<a href="/">
+					<div class="col-md-6">
+						<img src="../../assets/images/logo.png"
+							style="margin-top: -30px;">
 					</div>
+				</a>
+				<div class="col-md-6">
+					<form action="/search"
+						method="get">
+						<div class="form-row">
+							<div class="form-group col-md-8">
+								<input class="form-control"
+									type="search"
+									placeholder="Search"
+									name="query"
+									aria-label="Search">
+							</div>
+							<div class="form-group col-md-4">
+								<button class="btn btn-primary btn-block"
+									type="submit"
+									value="{{ results.responseHeader.params.q }}">Search &raquo;</button>
+							</div>
+						</div>
+					</form>
 				</div>
-			</form>
-			<div>
-			<p>
-			{{ results }}
-			<p>
-			<div>
-	</body>
+			</div>
+		</div>
+
+		<hr />
+		
+		<!-- TODO: results returned, pagination -->
+
+		{% if results.spellcheck.collations[1] %}
+		<div>
+			<p>Did you mean <b>
+				<a href="/search?query={{results.spellcheck.collations[1]}}">
+					{{results.spellcheck.collations[1]}}</a></b>?
+			</p>
+		</div>
+		{% elif results.response.numfound == 0 %}
+		<div>
+			<p>No results found!</p>
+		</div>
+		{% endif %}
+
+		{% for result in results.response.docs %}
+		<div class="position-relative">
+			<a class="stretched-link"
+				href="/pkgs/{{ result.name }}">
+				<h3>{{ result.name }}</h3>
+			</a>
+			<p>{{ result.description }}</p>
+		</div>
+		{% endfor %}
+</body>
+
 </html>
diff --git a/templates/sitemap-index.xml.j2 b/templates/sitemap-index.xml.j2
index 7ee5b7c..97a0125 100644
--- a/templates/sitemap-index.xml.j2
+++ b/templates/sitemap-index.xml.j2
@@ -4,5 +4,5 @@
   <sitemap>
 		<loc>{{ url ~ sitemap }}</loc>
 	</sitemap>
-    {% endfor %}
+  {% endfor %}
 </sitemapindex>

